diff --git a/app.js b/app.js
index a7200c6..ea529c3 100644
--- a/app.js
+++ b/app.js
@@ -5,6 +5,11 @@ var path = require('path');
 var ws = require('websocket').server;
 var pty = require('pty.js');
 var fs = require('fs');
+var waitpid = require('waitpid');
+
+process.on('SIGCHLD', function(args){
+    waitpid(-1);
+});
 
 var opts = require('optimist')
     .options({
diff --git a/package.json b/package.json
index 5acd6a1..3e997ec 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
     "express": "3.5.1",
     "websocket": "",
     "pty.js": "",
-    "optimist": ""
+    "optimist": "",
+    "waitpid": ""
   },
   "description": "Wetty = Web + tty. Terminal access in browser over http/https ",
   "main": "app.js",