diff --git a/bin/easyengine b/bin/easyengine
index 58821db3..612ab387 100644
--- a/bin/easyengine
+++ b/bin/easyengine
@@ -434,6 +434,99 @@ elif [ "$EE_FIRST" = "site" ]; then
 			ee_lib_service nginx reload
 		fi
 	fi
+
+elif [ "$EE_FIRST" = "debug" ]; then
+	# Default action
+	EE_DEBUG="--start"
+
+	# Auto arrange debug arguments
+	for ee_debug_args in $@; do
+		[ "$ee_debug_args" = "-i" ] && EE_DEBUG_INTERACTIVE=$ee_debug_args && echo EE_DEBUG_INTERACTIVE = $EE_DEBUG_INTERACTIVE &>> $EE_COMMAND_LOG
+		[ "$ee_debug_args" = "--stop" ] && EE_DEBUG=$ee_debug_args && echo EE_DEBUG = $EE_DEBUG &>> $EE_COMMAND_LOG
+		[ "$ee_debug_args" = "--nginx" ] && EE_DEBUG_NGINX=$ee_debug_args && echo EE_DEBUG_NGINX = $EE_DEBUG_NGINX &>> $EE_COMMAND_LOG
+		[ "$ee_debug_args" = "--rewrite" ] && EE_DEBUG_REWRITE=$ee_debug_args && echo EE_DEBUG_REWRITE = $EE_DEBUG_REWRITE &>> $EE_COMMAND_LOG
+		[ "$ee_debug_args" = "--php" ] && EE_DEBUG_PHP=$ee_debug_args && echo EE_DEBUG_PHP = $EE_DEBUG_PHP &>> $EE_COMMAND_LOG
+		[ "$ee_debug_args" = "--fpm" ] && EE_DEBUG_FPM=$ee_debug_args && echo EE_DEBUG_FPM = $EE_DEBUG_FPM &>> $EE_COMMAND_LOG
+		[ "$ee_debug_args" = "--mysql" ] && EE_DEBUG_MYSQL=$ee_debug_args && echo EE_DEBUG_MYSQL = $EE_DEBUG_MYSQL &>> $EE_COMMAND_LOG
+		[ "$ee_debug_args" = "--wp" ] && EE_DEBUG_WP=$ee_debug_args && echo EE_DEBUG_WP = $EE_DEBUG_WP &>> $EE_COMMAND_LOG
+		if [ "$ee_debug_args" != "debug" ] && [ "$ee_debug_args" != "-i" ] && [ "$ee_debug_args" != "--start" ] && [ "$ee_debug_args" != "--stop" ] && [ "$ee_debug_args" != "--nginx" ] && [ "$ee_debug_args" != "--rewrite" ] && [ "$ee_debug_args" != "--php" ] && [ "$ee_debug_args" != "--fpm" ] && [ "$ee_debug_args" != "--mysql" ] && [ "$ee_debug_args" != "--wp" ]; then
+			ls /etc/nginx/sites-available/ | grep $ee_debug_args &>> $EE_COMMAND_LOG
+			if [ $? -eq 0 ]; then
+				EE_DOMAIN_CHECK=$ee_debug_args && echo EE_DOMAIN_CHECK = $EE_DOMAIN_CHECK &>> $EE_COMMAND_LOG
+
+				# Domain name find out
+				ee_lib_check_domain
+				echo EE_DOMAIN =  $EE_DOMAIN  &>> $EE_COMMAND_LOG
+			fi
+		fi
+	done
+
+	# The following code execute on
+	# ee debug
+	# ee debug -i
+	# ee debug --start
+	# ee debug --stop
+	# ee debug example.com
+	if [ -z "$EE_DEBUG_NGINX" ] && [ -z "$EE_DEBUG_REWRITE" ] && [ -z "$EE_DEBUG_PHP" ] && [ -z "$EE_DEBUG_FPM" ] && [ -z "$EE_DEBUG_MYSQL" ] && [ -z "$EE_DEBUG_WP" ]; then
+		EE_DEBUG_NGINX="--nginx" && echo EE_DEBUG_NGINX = $EE_DEBUG_NGINX &>> $EE_COMMAND_LOG
+		EE_DEBUG_REWRITE="--rewrite" && echo EE_DEBUG_REWRITE = $EE_DEBUG_REWRITE &>> $EE_COMMAND_LOG
+		EE_DEBUG_PHP="--php" && echo EE_DEBUG_PHP = $EE_DEBUG_PHP &>> $EE_COMMAND_LOG
+		EE_DEBUG_FPM="--fpm" && echo EE_DEBUG_FPM = $EE_DEBUG_FPM &>> $EE_COMMAND_LOG
+		EE_DEBUG_MYSQL="--mysql" && echo EE_DEBUG_MYSQL = $EE_DEBUG_MYSQL &>> $EE_COMMAND_LOG
+
+		if [ -n "$EE_DOMAIN" ]; then
+			EE_DEBUG_WP="--wp" && echo EE_DEBUG_WP = $EE_DEBUG_WP &>> $EE_COMMAND_LOG
+		fi
+	fi
+
+	# Actual debug function call
+	if [ "$EE_DEBUG_NGINX" = "--nginx" ]; then
+		# Debug NGINX
+		ee_mod_debug_nginx
+	fi
+
+	if [ "$EE_DEBUG_REWRITE" = "--rewrite" ]; then
+		# Debug NGINX rewrite rules
+		ee_mod_debug_rewrite
+	fi
+
+	if [ "$EE_DEBUG_PHP" = "--php" ]; then
+		# Debug PHP slow log and enable xdebug profiling
+		ee_mod_debug_php
+	fi
+
+	if [ "$EE_DEBUG_FPM" = "--fpm" ]; then
+		# Change PHP log_level from notice to debug
+		ee_mod_debug_fpm
+	fi
+
+	if [ "$EE_DEBUG_MYSQL" = "--mysql" ]; then
+		# Enable MySQL slow query
+		ee_mod_debug_mysql
+	fi
+
+	if [ "$EE_DEBUG_WP" = "--wp" ]; then
+		# Enable WordPress debug.log
+		ee_mod_debug_wp
+	fi
+
+	# Execute: service nginx reload
+	if [ "EE_TRIGGER_NGINX" = "true" ];
+		ee_lib_service nginx reload
+	fi
+
+	if [ "EE_TRIGGER_PHP" = "true" ];
+		ee_lib_service php5-fpm restart
+	fi
+
+	if [ "$EE_DEBUG_INTERACTIVE" = "-i" ]; then
+		# Debug stop on CTRL+C
+		trap "ee_mod_debug_stop" EXIT
+
+		tail -f $EE_DEBUG_MSG
+	elif [ "$EE_DEBUG_INTERACTIVE" != "-i" ] && [ "$EE_DEBUG" != "--stop" ]; then
+		ee_lib_echo_info "tail -f $EE_DEBUG_MSG"
+	fi
 fi
 
 }
diff --git a/src/modules/debug/ee_mod_debug_fpm.sh b/src/modules/debug/ee_mod_debug_fpm.sh
index 15786f87..357b10f4 100644
--- a/src/modules/debug/ee_mod_debug_fpm.sh
+++ b/src/modules/debug/ee_mod_debug_fpm.sh
@@ -15,6 +15,9 @@ function ee_mod_debug_fpm()
 			# Display message
 			ee_lib_echo "PHP5-FPM log_level = debug already setup"
 		fi
+
+		# Debug message
+		EE_DEBUG_MSG="$EE_DEBUG_MSG /var/log/php5/fpm.log"
 	elif [ "$EE_DEBUG" = "--stop" ]; then
 		grep "log_level = debug" /etc/php5/fpm/php-fpm.conf &>> $EE_COMMAND_LOG
 		if [ $? -eq 0 ]; then
diff --git a/src/modules/debug/ee_mod_debug_interactive.sh b/src/modules/debug/ee_mod_debug_interactive.sh
deleted file mode 100644
index e98ee821..00000000
--- a/src/modules/debug/ee_mod_debug_interactive.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Enables debug in interactive mode
-# When ee debug module run with -i flag
-# This function is called display output on screen until
-# User press CTRL+C (which call ee_mod_debug_stop function)
-
-function ee_mod_debug_interactive()
-{
-	if [ -z "$EE_DOMAIN" ]; then
-		tail -f /var/log/nginx/*.error.log /var/log/php5/*.log /var/log/mysql/*.log
-	else
-		tail -f /var/log/nginx/*.error.log /var/log/php5/*.log /var/log/mysql/*.log /var/www/$EE_DOMAIN/htdocs/wp-content/debug.log
-	fi
-}
diff --git a/src/modules/debug/ee_mod_debug_mysql.sh b/src/modules/debug/ee_mod_debug_mysql.sh
index 29ff4bec..441ae55f 100644
--- a/src/modules/debug/ee_mod_debug_mysql.sh
+++ b/src/modules/debug/ee_mod_debug_mysql.sh
@@ -22,6 +22,9 @@ function ee_mod_debug_mysql()
 			# Display message
 			ee_lib_echo "MySQL slow log already enabled"
 		fi
+
+		# Debug message
+		EE_DEBUG_MSG="$EE_DEBUG_MSG /var/log/mysql/slow.log"
 	elif [ "$EE_DEBUG" = "--stop" ]; then
 		mysql -e "show variables like 'slow_query_log';" | grep ON &>> $EE_COMMAND_LOG
 		if [ $? -eq 0 ]; then
diff --git a/src/modules/debug/ee_mod_debug_nginx.sh b/src/modules/debug/ee_mod_debug_nginx.sh
index 62fd326d..aeda9765 100644
--- a/src/modules/debug/ee_mod_debug_nginx.sh
+++ b/src/modules/debug/ee_mod_debug_nginx.sh
@@ -25,6 +25,9 @@ function ee_mod_debug_nginx()
 				# Display message
 				ee_lib_echo "NGINX debug connection already enabled"
 			fi
+
+			# Debug message
+			EE_DEBUG_MSG="/var/log/nginx/*.error.log"
 		else
 			grep "error.log debug" /etc/nginx/sites-available/$EE_DOMAIN &>> $EE_COMMAND_LOG
 			if [ $? -ne 0 ]; then
@@ -38,6 +41,9 @@ function ee_mod_debug_nginx()
 				# Display message
 				ee_lib_echo "Already enable NGINX debug connection for $EE_DOMAIN"
 			fi
+			
+			# Debug message
+			EE_DEBUG_MSG="/var/www/$EE_DOMAIN/logs/error.log"
 		fi
 	elif [ "$EE_DEBUG" = "--stop" ]; then
 		if [ -z $EE_DOMAIN ]; then
diff --git a/src/modules/debug/ee_mod_debug_php.sh b/src/modules/debug/ee_mod_debug_php.sh
index 90eadfc0..12ad1ed5 100644
--- a/src/modules/debug/ee_mod_debug_php.sh
+++ b/src/modules/debug/ee_mod_debug_php.sh
@@ -16,6 +16,9 @@ function ee_mod_debug_php()
 			# Display message
 			ee_lib_echo "PHP5-FPM slow log already enabled"
 		fi
+
+		# Debug message
+		EE_DEBUG_MSG="$EE_DEBUG_MSG /var/log/php5/slow.log"
 	elif [ "$EE_DEBUG" = "--stop" ]; then
 		# Perform search inside upstream php block
 		sed -n "/upstream php {/,/}/p" /etc/nginx/conf.d/upstream.conf | grep 9001 &>> $EE_COMMAND_LOG
diff --git a/src/modules/debug/ee_mod_debug_rewrite.sh b/src/modules/debug/ee_mod_debug_rewrite.sh
index dd04468f..8289e94a 100644
--- a/src/modules/debug/ee_mod_debug_rewrite.sh
+++ b/src/modules/debug/ee_mod_debug_rewrite.sh
@@ -16,6 +16,9 @@ function ee_mod_debug_rewrite()
 				# Display message
 				ee_lib_echo "NGINX rewrite logs already enabled"
 			fi
+
+			# Debug message
+			EE_DEBUG_MSG="$EE_DEBUG_MSG /var/log/nginx/*.error.log"
 		else
 			grep "rewrite_log on;" /etc/nginx/sites-available/$EE_DOMAIN &>> $EE_COMMAND_LOG
 			if [ $? -ne 0 ]; then
@@ -29,6 +32,9 @@ function ee_mod_debug_rewrite()
 				# Display message
 				ee_lib_echo "NGINX rewrite logs for $EE_DOMAIN already enabled"
 			fi
+			
+			# Debug message
+			EE_DEBUG_MSG="$EE_DEBUG_MSG /var/log/$EE_DOMAIN/logs/error.log"
 		fi
 	elif [ "$EE_DEBUG" = "--stop" ]; then
 		if [ -z $EE_DOMAIN ]; then
diff --git a/src/modules/debug/ee_mod_debug_stop.sh b/src/modules/debug/ee_mod_debug_stop.sh
index 5167f3cb..37d68ac3 100644
--- a/src/modules/debug/ee_mod_debug_stop.sh
+++ b/src/modules/debug/ee_mod_debug_stop.sh
@@ -22,5 +22,3 @@ function ee_mod_debug_stop()
 	# Successful exit
 	exit 0;
 }
-
-trap "ee_mod_debug_stop" EXIT
diff --git a/src/modules/debug/ee_mod_debug_wp.sh b/src/modules/debug/ee_mod_debug_wp.sh
index a452a22a..8c58ab91 100644
--- a/src/modules/debug/ee_mod_debug_wp.sh
+++ b/src/modules/debug/ee_mod_debug_wp.sh
@@ -25,6 +25,9 @@ function ee_mod_debug_wp()
 				# Display message
 				ee_lib_echo "WordPress debug log already enabled for $EE_DOMAIN"
 			fi
+
+			# Debug message
+			EE_DEBUG_MSG="$EE_DEBUG_MSG /var/www/$EE_DOMAIN/htdocs/wp-content/debug.log"
 		else
 			# Display message
 			ee_lib_echo_fail "Unable to find /var/www/$EE_DOMAIN/wp-config.php"