diff --git a/src/CmdServer.py b/src/CmdServer.py
index ef264fe..03a5327 100644
--- a/src/CmdServer.py
+++ b/src/CmdServer.py
@@ -156,9 +156,10 @@ class MyCmdUserData(object):
         self.registers = registers
 
 class CmdServer(threading.Thread):
-    def __init__(self, address, port, notifier, registers):
+    def __init__(self, config, notifier, registers):
         super().__init__()
-        self.server = MyThreadingTCPServer((address, port), CmdHandle, MyCmdUserData(notifier, registers))
+        self.config = config
+        self.server = MyThreadingTCPServer((config.cmdAddress, config.cmdPort), CmdHandle, MyCmdUserData(notifier, registers))
 
     def start(self):
         self.server.serve_forever()
diff --git a/src/Config.py b/src/Config.py
index 145941d..77f41a2 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -5,4 +5,6 @@ class Config(object):
         self.mqttBrokerPort = 1883
         self.mqttLogin = ''
         self.mqttPassword = ''
+        self.cmdAddress = '127.0.0.1'
+        self.cmdPort = 9999
 
diff --git a/src/master.py b/src/master.py
index e3af53c..5868a4a 100644
--- a/src/master.py
+++ b/src/master.py
@@ -35,5 +35,5 @@ if __name__ == "__main__":
     nf.register(qf)
     qf.start()
 
-    cs = CmdServer.CmdServer(config, '127.0.0.1',9999, nf, datapoints)
+    cs = CmdServer.CmdServer(config, nf, datapoints)
     cs.start()
\ No newline at end of file