diff --git a/.drone.yml b/.drone.yml
index 89a44e2de..b79617d70 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,7 +14,7 @@ pipeline:
       - ./packager/publish_deb_rpm.sh
     secrets: ['packagecloud_token']
     when:
-      event: tag          
+      event: tag
   build_apk:
     group: build
     image: keymetrics/alpine-pm2-builder:latest
@@ -22,4 +22,4 @@ pipeline:
       - AWS_REPO_BUCKET=alpine-apk.pm2.io
     secrets: ['apk_rsa_priv_key', 'apk_rsa_pub_key', 'aws_access_key_id', 'aws_secret_access_key']
     when:
-      event: tag          
+      event: tag
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 549bfe759..cbc7115c2 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -12,11 +12,11 @@ We 'd like to keep our master branch as clean as possible, please avoid PRs on m
 
 ## Fire an issue
 
-When you got an issue by using pm2, you will fire an issue on [github](https://github.com/Unitech/pm2). We'll be glad to help or to fix it but the more data you give the most fast it would be resolved. 
+When you got an issue by using pm2, you will fire an issue on [github](https://github.com/Unitech/pm2). We'll be glad to help or to fix it but the more data you give the most fast it would be resolved.
 Please try following these rules it will make the task easier for you and for us:
 
 #### 1. Search through issues if it hasn't been resolved yet
-#### 2. Make sure that you provide following informations: 
+#### 2. Make sure that you provide following informations:
   - pm2 version `pm2 --version`
   - nodejs version `node --version`
   - operating system
@@ -27,7 +27,7 @@ Please try following these rules it will make the task easier for you and for us
   - How may I reproduce this? (this isn't easy in some cases)
   - Are you using a cluster module? Are you trying to catch SIGTERM signals? With `code` if possible.
 
-#### 4. Think global 
+#### 4. Think global
 If your issue is too specific we might not be able to help and stackoverflow might be a better place to seak for an answer
 
 #### 5. Be clear and format issues with [markdown](http://daringfireball.net/projects/markdown/)
@@ -37,4 +37,4 @@ Note that we might understand english, german and french but english is prefered
 
 ```DEBUG=pm2:* PM2_DEBUG=true ./bin/pm2 --no-daemon start my-buggy-thing.js```
 
-If your issue is flagged as `need data` be sure that there won't be any upgrade unless we can have enough data to reproduce. 
+If your issue is flagged as `need data` be sure that there won't be any upgrade unless we can have enough data to reproduce.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 21dda9d79..e786fb8b1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -111,8 +111,8 @@ npm install git-changelog -g
 
 ### usage
 
-Edit .changelogrc  
-Change "version_name" to the next version to release (example 1.1.2).  
+Edit .changelogrc
+Change "version_name" to the next version to release (example 1.1.2).
 Change "tag" to the latest existing tag (example 1.1.1).
 
 Run the following command into pm2 directory
diff --git a/changelogTemplate.md b/changelogTemplate.md
index b82e71d2c..2d515ec67 100644
--- a/changelogTemplate.md
+++ b/changelogTemplate.md
@@ -1,8 +1,8 @@
 <% if(logo) { %><img width="710px" src="<%= logo %>" alt="pm2 logo" /> <% } %>
 <% if(logo) { %># <%= title %> <% } %>
-<% if(intro) { %><%= '\n' %><%= intro %><%= '\n' %><% } %> 
+<% if(intro) { %><%= '\n' %><%= intro %><%= '\n' %><% } %>
 <% if(version && (version.name || version.number)) { %>##<% if(version.name){%> <%= version.name %><% } %> <% if(version.date){ %>( <%= version.date %> )<% } %><%= '\n' %><% } %>
-<% _.forEach(sections, function(section){ 
+<% _.forEach(sections, function(section){
   if(section.commitsCount > 0) { %>
 ## <%= section.title %>
 <% _.forEach(section.commits, function(commit){ %>  - <%= printCommit(commit, true) %><% }) %>
diff --git a/examples/misc-examples/apps/killfast.json b/examples/misc-examples/apps/killfast.json
index fbb8b0a98..f6fc13288 100644
--- a/examples/misc-examples/apps/killfast.json
+++ b/examples/misc-examples/apps/killfast.json
@@ -1,6 +1,6 @@
 {
   "min_uptime" : "100",
-  "max_restarts" : "400", 
+  "max_restarts" : "400",
   "name" : "auto-kill",
   "script" : "./examples/killfast.js"
 }
diff --git a/examples/misc-examples/exit.js b/examples/misc-examples/exit.js
index 23fb97f15..d32974ee1 100644
--- a/examples/misc-examples/exit.js
+++ b/examples/misc-examples/exit.js
@@ -1,5 +1,5 @@
 
-// process.on('exit', function() {  
+// process.on('exit', function() {
 //   console.log('About to exit.');
 // });
 
diff --git a/examples/start-a-binary/ls b/examples/start-a-binary/ls
index 6dd19be88..edd6db318 100755
Binary files a/examples/start-a-binary/ls and b/examples/start-a-binary/ls differ
diff --git a/lib/completion.js b/lib/completion.js
index 82ade219a..065a3f21f 100644
--- a/lib/completion.js
+++ b/lib/completion.js
@@ -53,7 +53,7 @@ exports.complete = function complete(name, completer, cb) {
       // Really, one should not be tossing away EPIPE errors, or any
       // errors, so casually.  But, without this, `. <(npm completion)`
       // can never ever work on OS X.
-      //      -- isaacs 
+      //      -- isaacs
       // https://github.com/isaacs/npm/blob/master/lib/completion.js#L162
       if (er.errno === "EPIPE") er = null
       cb(er, null, content);
diff --git a/lib/tools/xdg-open b/lib/tools/xdg-open
index 9be7f32f6..2962c6ca2 100755
--- a/lib/tools/xdg-open
+++ b/lib/tools/xdg-open
@@ -415,7 +415,7 @@ detectDE()
            DE=gnome;
            ;;
          LXDE|Lubuntu)
-           DE=lxde; 
+           DE=lxde;
            ;;
          MATE)
            DE=mate;
@@ -428,7 +428,7 @@ detectDE()
 
     if [ x"$DE" = x"" ]; then
       # fallback to uname output for other platforms
-      case "$(uname 2>/dev/null)" in 
+      case "$(uname 2>/dev/null)" in
         Darwin)
           DE=darwin;
           ;;
diff --git a/packager/setup.deb.sh b/packager/setup.deb.sh
index 5d78d6127..4727b67fb 100755
--- a/packager/setup.deb.sh
+++ b/packager/setup.deb.sh
@@ -4,7 +4,7 @@ REPOSITORY_OWNER="Keymetrics"
 
 show_banner ()
 {
-    echo 
+    echo
     echo "__/\\\\\\\\\\\\\\\\\\\\\\\\\\____/\\\\\\\\____________/\\\\\\\\____/\\\\\\\\\\\\\\\\\\_____"
     echo " _\\/\\\\\\/////////\\\\\\_\\/\\\\\\\\\\\\________/\\\\\\\\\\\\__/\\\\\\///////\\\\\\___"
     echo "  _\\/\\\\\\_______\\/\\\\\\_\\/\\\\\\//\\\\\\____/\\\\\\//\\\\\\_\\///______\\//\\\\\\__"
@@ -209,7 +209,7 @@ main ()
     if [ "$CURR_USER" == "" ]; then
 	CURR_USER=$USER
     fi
-    
+
     if [ "$CURR_USER" == "root" ] || [ "$CURR_USER" == "" ]; then
 	echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 	echo "WARNING: You are either running this script as root or the"
diff --git a/packager/setup.rpm.sh b/packager/setup.rpm.sh
index 15322c822..41cd707f8 100755
--- a/packager/setup.rpm.sh
+++ b/packager/setup.rpm.sh
@@ -4,7 +4,7 @@ REPOSITORY_OWNER="Keymetrics"
 
 show_banner ()
 {
-    echo 
+    echo
     echo "__/\\\\\\\\\\\\\\\\\\\\\\\\\\____/\\\\\\\\____________/\\\\\\\\____/\\\\\\\\\\\\\\\\\\_____"
     echo " _\\/\\\\\\/////////\\\\\\_\\/\\\\\\\\\\\\________/\\\\\\\\\\\\__/\\\\\\///////\\\\\\___"
     echo "  _\\/\\\\\\_______\\/\\\\\\_\\/\\\\\\//\\\\\\____/\\\\\\//\\\\\\_\\///______\\//\\\\\\__"
@@ -158,7 +158,7 @@ install_pm2 ()
     if [ "$CURR_USER" == "" ]; then
 	CURR_USER=$USER
     fi
-    
+
     if [ "$CURR_USER" == "root" ] || [ "$CURR_USER" == "" ]; then
 	echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 	echo "WARNING: You are either running this script as root or the"
@@ -171,7 +171,7 @@ install_pm2 ()
 	echo -n "Adding $CURR_USER to group pm2..."
 	usermod -aG pm2 $CURR_USER
 	echo "done."
-    fi    
+    fi
 }
 
 main ()
@@ -188,7 +188,7 @@ main ()
 	yum_repo_path=/etc/yum.repos.d/Keymetrics_pm2.repo
 	install_node
     fi
-    
+
     echo "Downloading repository file: ${yum_repo_config_url}"
 
     curl -sSf "${yum_repo_config_url}" > $yum_repo_path
diff --git a/test/benchmarks/monit.sh b/test/benchmarks/monit.sh
index 5ea4f80dc..b84e63b6c 100755
--- a/test/benchmarks/monit.sh
+++ b/test/benchmarks/monit.sh
@@ -6,7 +6,7 @@ export RESULT_FILE=$RESULT_FILE
 
 launch() {
     echo "========= `date`" >> $RESULT_FILE
-    nohup ./monit-daemon.sh &> monit.log &    
+    nohup ./monit-daemon.sh &> monit.log &
 }
 
 ppkill() {
diff --git a/test/fixtures/args.js b/test/fixtures/args.js
index e6ce188ff..bb1ad890e 100644
--- a/test/fixtures/args.js
+++ b/test/fixtures/args.js
@@ -5,5 +5,5 @@ if (process.argv.indexOf('-d') == -1 || process.argv.indexOf('-a') == -1) {
 } else {
   setInterval(function() {
     console.log('ok');
-  }, 500);  
+  }, 500);
 }
diff --git a/test/fixtures/git/index b/test/fixtures/git/index
index 1f2626ff4..a79f428b8 100644
Binary files a/test/fixtures/git/index and b/test/fixtures/git/index differ
diff --git a/test/fixtures/mjs/ecosystem.config.js b/test/fixtures/mjs/ecosystem.config.js
index 03d8ed502..30f8edcc8 100644
--- a/test/fixtures/mjs/ecosystem.config.js
+++ b/test/fixtures/mjs/ecosystem.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-  
+
   apps : [
 
 
diff --git a/test/helpers/plan.js b/test/helpers/plan.js
index fabe21fce..8d1991611 100644
--- a/test/helpers/plan.js
+++ b/test/helpers/plan.js
@@ -6,7 +6,7 @@ var assert = require('assert');
  * @method Plan
  * @param {} count
  * @param {} done
- * @return 
+ * @return
  */
 function Plan(count, done) {
   this.done = done;
@@ -17,7 +17,7 @@ function Plan(count, done) {
  * Description
  * @method ok
  * @param {} expression
- * @return 
+ * @return
  */
 Plan.prototype.ok = function(expression) {
   assert(expression);
diff --git a/test/programmatic/misc_commands.js b/test/programmatic/misc_commands.js
index b0b7aa153..ac80e5b85 100644
--- a/test/programmatic/misc_commands.js
+++ b/test/programmatic/misc_commands.js
@@ -34,7 +34,7 @@ describe('Misc commands', function() {
       should(err).be.null();
       done();
     });
-  }); 
+  });
 
   it('should restart them', function(done) {
     pm2.restart('all', function(err, data) {