diff --git a/.travis.yml b/.travis.yml
index fad93766..65a627a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,48 +21,20 @@ before_script:
 script:
 - sudo echo -e "[user]\n\tname = Mitesh Shah\n\temail = root@localhost" > ~/.gitconfig
 - sudo echo "Travis Banch = $TRAVIS_BRANCH"
-- sudo bash -x bin/install.sh $TRAVIS_BRANCH
+- sudo bash bin/install.sh $TRAVIS_BRANCH
 
 - sudo ee stack install
-- sudo ee stack purge
-- sudo ee system install nginx
-- sudo ee system install php
-- sudo ee system install mysql
-- sudo ee system install postfix
-- sudo ee system install phpmyadmin
-- sudo ee system install adminer
-- sudo ee system install wpcli
-- sudo ee system install utils
-
-
-- sudo cat /var/log/easyengine/*
-
-- sudo ls -lah /usr/local/sbin
-- sudo find /usr/local/sbin
-
-- sudo ls -lah /usr/share/easyengine
-- sudo find /usr/share/easyengine
-
-- sudo ls -lah /usr/local/lib/easyengine
-- sudo find /usr/local/lib/easyengine
-
-- sudo wp --allow-root --info
-- sudo bash -x ee system status
-- sudo bash -x ee stack stop
-- sudo bash -x ee stack start
-- sudo bash -x ee stack restart
-- sudo bash -x ee stack reload
-- sudo bash ee info nginx
-- sudo bash ee info php
-- sudo bash ee info mysql
 - sudo bash ee info
 
 - sudo bash ee site create html.com
-- sudo bash ee site create html2.com --html
-- sudo bash ee site info html.com
-- sudo bash ee site show html.com
-- sudo bash ee site list
-- sudo bash ee site list available
 - sudo bash ee site create php.com --php
 - sudo bash ee site create mysql.com --mysql
+- sudo bash ee site create wp-basic.com --wp
+- sudo bash ee site create wpsubdir-basic.com --wpsubdir
+- sudo bash ee site create wpsubdomain-basic.com --wpsubdomain
+
+- sudo bash ee site create wpsubdir-basic2.com --wpsubdirectory
+- sudo bash ee site create wpsubdomain-basic2.com --wpsubdom
 - sudo mysql -e "show databases";
+- sudo wp --allow-root --info
+- sudo cat /var/log/easyengine/*
diff --git a/bin/easyengine b/bin/easyengine
index 6c8dcc6e..d1a568ff 100644
--- a/bin/easyengine
+++ b/bin/easyengine
@@ -225,10 +225,12 @@ elif [ "$EE_FIRST" = "site" ]; then
 		fi
 		# WordPresss subdirectory variables
 		if [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdirectory" ]; then
+			EE_SITE_CREATE_OPTION="--wpsubdir"
 			EE_NETWORK_ACTIVATE="--network"
 		fi
 		# WordPress sub-domain variables
 		if [ "$EE_SITE_CREATE_OPTION" = "--wpsubdom" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then
+			EE_SITE_CREATE_OPTION="--wpsubdomain"
 			EE_NETWORK_ACTIVATE="--network"
 			EE_WP_SUBDOMAIN="--subdomains"
 		fi
@@ -247,7 +249,7 @@ elif [ "$EE_FIRST" = "site" ]; then
 			EE_NGINX_CONF=$(echo $EE_SITE_CREATE_OPTION | cut -c3-)/basic.conf
 			echo -e "EE_DOMAIN_CHECK = $EE_DOMAIN_CHECK \nEE_SITE_CREATE_OPTION = $EE_SITE_CREATE_OPTION \nEE_SITE_CACHE_OPTION = $EE_SITE_CACHE_OPTION \nEE_NETWORK_ACTIVATE = $EE_NETWORK_ACTIVATE \nEE_WP_SUBDOMAIN = $EE_WP_SUBDOMAIN \nEE_NGINX_CONF = $EE_NGINX_CONF" &>> $EE_COMMAND_LOG
 
-			# Setup HTML|PHP|MySQL website
+			# Setup NGINX
 			ee_lib_check_domain
 			ee_mod_setup_domain
 
@@ -268,6 +270,45 @@ elif [ "$EE_FIRST" = "site" ]; then
 
 			# Display Success Message
 			ee_lib_echo_info "Successfully Created New Website: http://$EE_WWW_DOMAIN"
+		elif [ "$EE_SITE_CREATE_OPTION" = "--wp" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then
+			if [ "$EE_SITE_CACHE_OPTION" = "--basic" ]; then
+				# Configure variable
+				EE_NGINX_CONF=$(echo $EE_SITE_CREATE_OPTION | cut -c3-)/basic.conf
+				echo -e "EE_DOMAIN_CHECK = $EE_DOMAIN_CHECK \nEE_SITE_CREATE_OPTION = $EE_SITE_CREATE_OPTION \nEE_SITE_CACHE_OPTION = $EE_SITE_CACHE_OPTION \nEE_NETWORK_ACTIVATE = $EE_NETWORK_ACTIVATE \nEE_WP_SUBDOMAIN = $EE_WP_SUBDOMAIN \nEE_NGINX_CONF = $EE_NGINX_CONF" &>> $EE_COMMAND_LOG
+
+				# Setup NGINX
+				ee_lib_check_domain
+				ee_mod_setup_domain
+
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
+				ee_mod_setup_wordpress
+
+				# Setup WordPress Network
+				if [ "$EE_SITE_CREATE_OPTION" = "--wpsubdir" ] || [ "$EE_SITE_CREATE_OPTION" = "--wpsubdomain" ]; then
+					ee_mod_setup_network
+				fi
+
+				# Install WordPress plugins
+				ee_mod_plugin_nginx_helper
+
+				# Adjust permission
+				ee_lib_permissions
+
+				# Git commit
+				ee_lib_git /etc/nginx/ "$EE_DOMAIN created with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options"
+
+				# Display WordPress credential
+				echo
+				ee_lib_echo_info "WordPress Admin Username: $EE_WP_USER"
+				ee_lib_echo_info "WordPress Admin Password: $EE_WP_PASS"
+				echo
+
+				# Display Success Message
+				ee_lib_echo_info "Successfully Created New Website: http://$EE_WWW_DOMAIN"
+			fi
 		fi
 	fi
 fi
diff --git a/bin/ee b/bin/ee
index fa6c0dec..1c714d58 100644
--- a/bin/ee
+++ b/bin/ee
@@ -265,7 +265,11 @@ ee_mod_setup_domain()
 	fi
 }
 
-ee_mod_setup_wordpress()
+# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
+				ee_mod_setup_wordpress()
 {
 	# Download Latest WordPress
 	ee_lib_echo "Downloading WordPress, Please Wait..."
@@ -310,7 +314,11 @@ ee_mod_setup_wordpress()
 	| ed -s /var/www/$EE_DOMAIN/wp-config.php
 }
 
-ee_mod_setup_wordpress()
+# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
+				ee_mod_setup_wordpress()
 {
 	# Get WordPress Site Title
 	#ee_lib_echo "WordPress Information Required..."
@@ -373,8 +381,16 @@ SETUP_DOMAIN()
 	ee_mod_setup_domain
 
 	# Setup WordPress Webroot & Database
-	ee_mod_setup_wordpress
-	ee_mod_setup_wordpress
+	# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
+				ee_mod_setup_wordpress
+	# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
+				ee_mod_setup_wordpress
 }
 
 # Adjust permission
@@ -414,7 +430,7 @@ SUPERCACHENGINX()
 	wp plugin --allow-root activate wp-super-cache $EE_NETWORK_ACTIVATE &>> $EE_COMMAND_LOG || ee_lib_error "Unable To Activate WP Super Cache Plugin"
 }
 
-NGINXHELPER()
+ee_mod_plugin_nginx_helper()
 {
 	# Installing Nginx Helper
 	cd /var/www/$EE_DOMAIN/htdocs/
@@ -438,7 +454,7 @@ SETUPWPNETWORK()
 	
 	# Remove index.php from permalink
 	# Install Nginx Helper
-	NGINXHELPER
+	ee_mod_plugin_nginx_helper
 }
 
 
@@ -1104,8 +1120,12 @@ then
 				# Setup Basic Nginx
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
-				NGINXHELPER
+				ee_mod_plugin_nginx_helper
 				# Adjust permission
 			ee_lib_permissions
 
@@ -1128,8 +1148,12 @@ then
 				# Setup W3 Total Cache Nginx
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
-				NGINXHELPER
+				ee_mod_plugin_nginx_helper
 				TOTALCACHENGINX
 				# Adjust permission
 			ee_lib_permissions
@@ -1160,8 +1184,12 @@ then
 				# Setup WP Super Cache Nginx
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
-				NGINXHELPER
+				ee_mod_plugin_nginx_helper
 				SUPERCACHENGINX
 				# Adjust permission
 			ee_lib_permissions
@@ -1192,8 +1220,12 @@ then
 				# Setup Fastcgi Cache Nginx
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
-				NGINXHELPER
+				ee_mod_plugin_nginx_helper
 				TOTALCACHENGINX
 				# Adjust permission
 			ee_lib_permissions
@@ -1230,6 +1262,10 @@ then
 				# Setup Domain WordPress & Database
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
 				
 				# Setup WordPress SubDirectory Network
@@ -1259,6 +1295,10 @@ then
 				# Setup Domain WordPress & Database
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
 
 				# Setup WordPress SubDirectory Network
@@ -1296,6 +1336,10 @@ then
 				# Setup Domain WordPress & Database
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
 
 				# Setup WordPress SubDirectory Network
@@ -1333,6 +1377,10 @@ then
 				# Setup Domain WordPress & Database
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
 
 				# Setup WordPress SubDirectory Network
@@ -1376,6 +1424,10 @@ then
 				# Setup Domain WordPress & Database
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
 				
 				# Setup WordPress SubDirectory Network
@@ -1405,6 +1457,10 @@ then
 				# Setup Domain WordPress & Database
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
 
 				# Setup WordPress SubDirectory Network
@@ -1442,6 +1498,10 @@ then
 				# Setup Domain WordPress & Database
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
 
 				# Setup WordPress SubDirectory Network
@@ -1479,6 +1539,10 @@ then
 				# Setup Domain WordPress & Database
 				ee_lib_check_domain
 				ee_mod_setup_domain
+				# Setup MySQL database
+				ee_mod_setup_database
+
+				# Setup WordPress
 				ee_mod_setup_wordpress
 
 				# Setup WordPress SubDirectory Network