diff --git a/lib/manager.js b/lib/manager.js
index 8afd314..462fb53 100644
--- a/lib/manager.js
+++ b/lib/manager.js
@@ -3,6 +3,7 @@ var child_process = require('child_process');
 var crypto = require('crypto');
 var fs = require('fs');
 var extend = require('util')._extend;
+var waitpid = require('waitpid');
 var version = JSON.parse(fs.readFileSync(__dirname + '/../package.json', 'utf8')).version;
 
 var Manager = function(options) {
@@ -14,6 +15,8 @@ var Manager = function(options) {
   
   process.stdout.setMaxListeners(100);
   process.stderr.setMaxListeners(100);
+
+  setInterval(function() { waitpid(-1, true); }, 10000);
 };
 
 Manager.prototype.deploy = function(configuration, options) {
diff --git a/package.json b/package.json
index 1be1d67..27502be 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,8 @@
     "request": "~2.39",
     "commander": "2.3.0",
     "http-auth": "2.1.9",
-    "colors": "*"
+    "colors": "*",
+    "waitpid": "ArdaXi/node-waitpid"
   },
   "devDependencies": {
     "mocha": "*",