diff --git a/src/index.js b/src/index.js
index 6571cb5..2f8bf20 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,12 @@
 let conf = require("./helper/conf")();
 let websrv = require("./websrv")(conf);
 
-
 websrv.slisten((host, port) => {
   console.log("Server started on http://" + host + ":" + port);
 });
+
+process.on("SIGINT", () => {
+  console.log("\nWeb-Server Beenden ...");
+  websrv.close();
+  process.exit();
+});
diff --git a/src/websrv/index.js b/src/websrv/index.js
index fd9e2c9..2684bfb 100644
--- a/src/websrv/index.js
+++ b/src/websrv/index.js
@@ -14,8 +14,17 @@ module.exports = function (conf) {
   app.use("/internal", internalRouter);
 
   app.slisten = function (cb) {
+    app.ServerInstance = app.listen(
+      websrvConfig.port,
+      websrvConfig.host,
+      () => {
+        cb(websrvConfig.host, websrvConfig.port);
+      }
+    );
+  };
 
-    app.listen(websrvConfig.port, websrvConfig.host, () => {cb(websrvConfig.host, websrvConfig.port);});
+  app.close = function () {
+    app.ServerInstance.close();
   };
 
   return app;