diff --git a/core/build.gradle b/core/build.gradle
index d5445b3..055b3af 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,5 +1,5 @@
 group = 'asys'
-version = '0.3.1-SNAPSHOT'
+version = '0.3.2-SNAPSHOT'
 
 apply plugin: 'application'
 
diff --git a/core/src/main/java/asys/core/Main.java b/core/src/main/java/asys/core/Main.java
index 4248200..31385e6 100644
--- a/core/src/main/java/asys/core/Main.java
+++ b/core/src/main/java/asys/core/Main.java
@@ -14,8 +14,11 @@ public class Main {
     private static final Logger logger = LoggerFactory.getLogger("Launcher");
 
     public static void main(String[] args) {
-        Core asysCore = new Core();
+        final Core asysCore = new Core();
         asysCore.setConfiguration(getProperties());
+
+        Runtime.getRuntime().addShutdownHook(new Thread(asysCore::stop));
+
         asysCore.start();
     }