diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..3f202c57
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ebusd-configuration"]
+	path = ebusd-configuration
+	url = https://github.com/john30/ebusd-configuration.git
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100755
index 00000000..5e6dd346
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <Objective-C-extensions>
+          <file>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+          </file>
+          <class>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+          </class>
+          <extensions>
+            <pair source="cpp" header="h" />
+            <pair source="c" header="h" />
+          </extensions>
+        </Objective-C-extensions>
+      </value>
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/ebusd-configuration b/ebusd-configuration
new file mode 160000
index 00000000..58c7e6d2
--- /dev/null
+++ b/ebusd-configuration
@@ -0,0 +1 @@
+Subproject commit 58c7e6d22d16bdf39ad1a3e1754c1191dc11cbec
diff --git a/src/ebusd/network.cpp b/src/ebusd/network.cpp
index d9dac08f..60e7a5de 100755
--- a/src/ebusd/network.cpp
+++ b/src/ebusd/network.cpp
@@ -323,8 +323,9 @@ void Network::run() {
       Connection* connection = new Connection(socket, isHttp, m_netQueue);
       connection->start("connection");
       m_connections.push_back(connection);
+      string ip = socket->getIP();
       logInfo(lf_network, "[%05d] %s connection opened %s", connection->getID(), isHttp ? "HTTP" : "client",
-          socket->getIP().c_str());
+          ip.c_str());
     }
   }
 }