1 files changed, 6 insertions, 0 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index 068ad68..c7e18fa 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -46,7 +46,9 @@ public class SameController {
         @Override
         public void disableMaster() {
             if (master != null) {
+                pServer.removeService(master.getNewService());
                 master.interrupt();
+                master = null;
             }
         }
     };
@@ -173,4 +175,8 @@ public class SameController {
     public VariableFactory createVariableFactory() {
         return new VariableFactory(client.getInterface());
     }
+    
+    public void killMaster() {
+        masterController.disableMaster();
+    }
 }