diff --git a/package-lock.json b/package-lock.json
index 309046e..343af15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -267,6 +267,11 @@
         "unpipe": "1.0.0"
       }
     },
+    "formidable": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
+      "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak="
+    },
     "forwarded": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
@@ -277,6 +282,21 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
     },
+    "fs-extra": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "4.0.0",
+        "universalify": "0.1.1"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
     "has-binary2": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz",
@@ -338,6 +358,14 @@
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
       "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
     },
+    "jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -563,6 +591,11 @@
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
       "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
     },
+    "universalify": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc="
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
diff --git a/public/js/main.js b/public/js/main.js
index af7b26f..b87cd91 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -2,9 +2,21 @@ var whiteboardId = getQueryVariable("whiteboardid");
 whiteboardId = whiteboardId || "myNewWhiteboard";
 var myUsername = getQueryVariable("username");
 myUsername = myUsername || "unkonwn";
-var io = signaling_socket = io();
 
-io.on('connect', function () {
+var url = document.URL.substr(0,document.URL.lastIndexOf('/'));
+var signaling_socket = null;
+var urlSplit = url.split("/");
+var subdir = "";
+for(var i=3;i<urlSplit.length;i++) {
+    subdir = subdir+'/'+urlSplit[i];
+}
+if(subdir !="") {
+    signaling_socket = io("",{"path":subdir+"/socket.io"}); //Connect even if we are in a subdir behind a reverse proxy
+} else {
+    signaling_socket = io();
+}
+
+signaling_socket.on('connect', function () {
 	console.log("Websocket connected!");
 
     signaling_socket.on('drawToWhiteboard', function (content) {
@@ -21,11 +33,11 @@ $(document).ready(function() {
         whiteboardId : whiteboardId,
         username : myUsername,
         sendFunction : function(content) {
-        	io.emit('drawToWhiteboard', content);
+        	signaling_socket.emit('drawToWhiteboard', content);
         }
     });
 
-    $.get( "/loadwhiteboard", { wid: whiteboardId } ).done(function( data ) {
+    $.get( subdir+"/loadwhiteboard", { wid: whiteboardId } ).done(function( data ) {
         whiteboard.loadData(data)
     });