diff --git a/app.js b/app.js
index 947c2c7961fc85d65a21fbc6379907ff83d2e08e..e666b6b5d6800e734a2db729a0dc9791df439688 100644
--- a/app.js
+++ b/app.js
@@ -38,6 +38,15 @@ var allPhotos = require('./routes/all');
 
 var app = express();
 
+process.title = 'WiPho';
+var gracefulShutdown = function() {
+  console.log("Shutting down...");
+  process.exit();
+}
+
+process.on ('SIGTERM', gracefulShutdown);
+process.on ('SIGINT', gracefulShutdown);   
+
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
diff --git a/package.json b/package.json
index 9b7fc533ff57f95b83f83319d958f7198b892b90..7962b6e68cc6ec7040888b4c2e545015df827db1 100644
--- a/package.json
+++ b/package.json
@@ -3,16 +3,17 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "start": "node ./bin/www"
+    "start": "node ./bin/www",
+    "stop": "pkill --signal SIGINT WiPho"
   },
   "dependencies": {
-	"express": "~4.9.0",
+    "express": "~4.9.0",
     "body-parser": "~1.8.1",
     "cookie-parser": "~1.3.3",
     "morgan": "~1.3.0",
     "serve-favicon": "~2.1.3",
     "debug": "~2.0.0",
     "jade": "~1.6.0",
-	"gm": "~1.16.0"
+    "gm": "~1.16.0"
   }
-}
\ No newline at end of file
+}