diff --git a/bootstrap.php b/bootstrap.php
index 4275411b..b7b3e631 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -18,7 +18,8 @@
 
 require_once APP_ROOT . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 require_once 'steam-condenser.php';
-require_once APP_ROOT . 'websocket' . DIRECTORY_SEPARATOR . 'websocket.client.php';
+//require_once APP_ROOT . 'websocket' . DIRECTORY_SEPARATOR . 'websocket.client.php';
+require_once APP_ROOT . 'websocket' . DIRECTORY_SEPARATOR . 'websocket.hotfix.php';
 
 echo "
       ____        _
diff --git a/websocket/websocket.hotfix.php b/websocket/websocket.hotfix.php
new file mode 100644
index 00000000..fd905b21
--- /dev/null
+++ b/websocket/websocket.hotfix.php
@@ -0,0 +1,41 @@
+<?php
+
+class WebSocket {
+
+    private static $sock = null;
+
+    public function __call($name, $arguments) {
+        \eTools\Utils\Logger::error("Call undefined method $name " . print_r($arguments, true));
+    }
+
+    public function open() {
+        
+    }
+
+    public function __construct($url) {
+        $this->url = str_replace("ws://", "http://", $url);
+        preg_match("!^http://(.*):(\d+)/(.*)$!", $this->url, $match);
+        $this->ip = $match[1];
+        $this->port = $match[2] + 1;
+        $this->scope = $match[3];
+        \eTools\Utils\Logger::log("Setting WebSocket fix to " . $this->ip . ":" . $this->port);
+
+        if (self::$sock == null)
+            self::$sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+    }
+
+    public function sendData($data_string) {
+        $msg = json_encode(array("scope" => $this->scope, "data" => $data_string));
+        $len = strlen($msg);
+        socket_sendto(self::$sock, $msg, $len, 0, $this->ip, $this->port);
+    }
+
+    public function send($data_string) {
+        $msg = json_encode(array("scope" => $this->scope, "data" => $data_string));
+        $len = strlen($msg);
+        socket_sendto(self::$sock, $msg, $len, 0, $this->ip, $this->port);
+    }
+
+}
+
+?>
diff --git a/websocket_server.js b/websocket_server.js
index bdb4509b..106bb6d3 100644
--- a/websocket_server.js
+++ b/websocket_server.js
@@ -1,4 +1,3 @@
-var WebSocketServer = require('websocket').server;
 var http = require('http');
 var formidable = require('formidable');
 var archiver = require('archiver');
@@ -37,7 +36,7 @@ var server = http.createServer(function(request, response) {
                             archive.pipe(output);
 
                             var demo = DEMO_PATH + files.file.name;
-                            archive.append(fs.createReadStream(demo), { name: files.file.name });
+                            archive.append(fs.createReadStream(demo), {name: files.file.name});
                             archive.finalize();
 
                             if (fs.existsSync(DEMO_PATH + files.file.name) && fs.existsSync(DEMO_PATH + files.file.name + ".zip"))
@@ -53,6 +52,37 @@ var server = http.createServer(function(request, response) {
 
             break;
         default:
+            if (request.method == 'POST') {
+                var body = '';
+                request.on('data', function(data) {
+                    body += data;
+                });
+                request.on('end', function() {
+                    var data = {};
+                    try {
+                        data = JSON.parse(body);
+                        if (data.message === "ping") {
+                            return;
+                        }
+                    } catch (e) {
+                    }
+                    if (request.url == "/alive") {
+                        io.sockets.in('alive').emit('aliveHandler', {data: body});
+                    } else if (request.url == "/rcon") {
+                        io.sockets.in('rcon-' + data.id).emit('rconHandler', body);
+                    } else if (request.url == "/logger") {
+                        io.sockets.in('logger-' + data.id).emit('loggerHandler', body);
+                        io.sockets.in('loggersGlobal').emit('loggerGlobalHandler', body);
+                    } else if (request.url == "/match") {
+                        io.sockets.in('matchs').emit('matchsHandler', body);
+                    } else if (request.url == "livemap") {
+                        io.sockets.in('livemap-' + data.id).emit('livemapHandler', body);
+                    } else {
+                        message = JSON.parse(body);
+                    }
+                });
+            }
+
             response.writeHead(404);
             response.end();
             break;
@@ -69,192 +99,91 @@ server.listen(udp_port, function() {
     console.log((new Date()) + ' Server is listening on port ' + udp_port);
 });
 
-wsServer = new WebSocketServer({
-    httpServer: server,
-    autoAcceptConnections: false
-});
-
-function originIsAllowed(origin) {
-    // put logic here to detect whether the specified origin is allowed.
-    return true;
-}
+var io = require('socket.io').listen(server);
 
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function(obj, fromIndex) {
-        if (fromIndex == null) {
-            fromIndex = 0;
-        } else if (fromIndex < 0) {
-            fromIndex = Math.max(0, this.length + fromIndex);
-        }
-        for (var i = fromIndex, j = this.length; i < j; i++) {
-            if (this[i] === obj)
-                return i;
-        }
-        return -1;
-    };
-}
-
-var clients = new Array();
-clients["alive"] = new Array();
-clients["logger"] = new Array();
-clients["livemap"] = new Array();
-clients["rcon"] = new Array();
-clients["match"] = new Array();
-clients["chat"] = new Array();
-var chatlog = new Array();
-chatlog.push("chatlog");
-
-wsServer.on('request', function(request) {
-    if (!originIsAllowed(request.origin)) {
-        // Make sure we only accept requests from an allowed origin
-        request.reject();
-        console.log((new Date()) + ' Connection from origin ' + request.origin + ' rejected.');
-        return;
-    }
-
-    var connection = request.accept(null, request.origin);
-    var mode = request.resourceURL.path;
-    console.log((new Date()) + ' \[' + request.origin + '\] Connection accepted for ' + request.resourceURL.path + ' (' + request.remoteAddress + ')');
+io.set('log level', 0);
 
-    var clientIndex = null;
-
-    if (mode == "/alive") {
-        connection.alive = new Array();
-        clients["alive"].push(connection);
-        if (request.remoteAddress != udp_ip) {
+io.sockets.on('connection', function(socket) {
+    socket.taggedLogger = false;
+    socket.on('identify', function(data) {
+        if (data.type === "alive") {
+            socket.join("alive");
             var dgram = new Buffer("__aliveCheck__");
             clientUDP.send(dgram, 0, dgram.length, udp_port, udp_ip);
-        }
-    } else if (mode == "/logger") {
-        connection.logger = new Array();
-        clients["logger"].push(connection);
-        if (request.remoteAddress != udp_ip) {
+        } else if (data.type === "logger") {
+            if (data.match_id) {
+                socket.join("logger-" + data.match_id);
+            } else {
+                socket.join("loggersGlobal");
+            }
+
+            socket.join("loggers");
+            socket.taggedLogger = true;
+
+            // Send an UDP packet to enable logger forwading
             var dgram = new Buffer("__true__");
             clientUDP.send(dgram, 0, dgram.length, udp_port, udp_ip);
+        } else if ((data.type === "rcon") && data.match_id) {
+            socket.join("rcon-" + data.match_id);
+        } else if ((data.type === "livemap") && data.match_id) {
+            socket.join("livemap-" + data.match_id);
+        } else if (data.type === "matchs") {
+            socket.join("matchs");
         }
-    } else if (mode == "/rcon") {
-        connection.rcon = new Array();
-        clients["rcon"].push(connection);
-    } else if (mode == "/match") {
-        connection.match = new Array();
-        clients["match"].push(connection);
-    } else if (mode == "/livemap") {
-        connection.livemap = new Array();
-        clients["livemap"].push(connection);
-    } else if (mode == "/chat") {
-        connection.chat = new Array();
-        clients["chat"].push(connection);
-        connection.send(JSON.stringify(chatlog));
-        for (var c in clients["chat"]) {
-            clients["chat"][c].send(clients["chat"].length);
-        }
-    } else {
-        console.log("unknow mode " + mode);
-    }
+    });
 
-    connection.on('message', function(message) {
-        if (message.type === 'binary') {
-            return;
+    socket.on('disconnect', function(data) {
+        if (socket.taggedLogger) {
+            if (io.sockets.clients('loggers').length == 1) {
+                var dgram = new Buffer("__false__");
+                clientUDP.send(dgram, 0, dgram.length, udp_port, udp_ip);
+            }
         }
+    });
 
-        var data = {};
-        try {
-            data = JSON.parse(message.utf8Data);
-        } catch (e) {
-        }
+    socket.on('rconSend', function(data) {
+        var dgram = new Buffer(data);
+        clientUDP.send(dgram, 0, dgram.length, udp_port, udp_ip);
+    });
+
+    socket.on('matchCommandSend', function(data) {
+        var dgram = new Buffer(data);
+        clientUDP.send(dgram, 0, dgram.length, udp_port, udp_ip);
+    });
+});
+
+var dgram = require('dgram');
+var udpServer = dgram.createSocket('udp4');
 
+udpServer.on('listening', function() {
+    var address = udpServer.address();
+    console.log('UDP Server listening on ' + address.address + ":" + address.port);
+});
+
+udpServer.on('message', function(message, remote) {
+    var messageObject = JSON.parse(message);
+    var body = messageObject.data;
+    var data = {};
+    try {
+        var data = JSON.parse(body);
         if (data.message == "ping") {
             return;
-        } else if (mode == "/alive") {
-            for (var c in clients["alive"]) {
-                if (clients["alive"][c].remoteAddress != udp_ip) {
-                    clients["alive"][c].send(message.utf8Data);
-                }
-            }
-        } else if (mode == "/rcon") {
-            clientIndex = clients['rcon'].indexOf(connection, null);
-            if (request.remoteAddress != udp_ip) {
-                var regex = /registerMatch_(\d+)/;
-                if (message.utf8Data.match(regex)) {
-                    data = message.utf8Data.match(regex);
-                    clients['rcon'][clientIndex].rcon.push(data[1]);
-                } else {
-                    var dgram = new Buffer(message.utf8Data);
-                    clientUDP.send(dgram, 0, dgram.length, udp_port, udp_ip);
-                }
-                sentByServer = false;
-            } else {
-                for (var c in clients["rcon"]) {
-                    if (clients["rcon"][c].remoteAddress == udp_ip) {
-                        continue;
-                    } else if (c == clientIndex || clients['rcon'][c].rcon.indexOf(data.id, null) < 0) {
-                        continue;
-                    }
-                    clients["rcon"][c].send(message.utf8Data);
-                }
-            }
-        } else if (mode == "/logger") {
-            clientIndex = clients['logger'].indexOf(connection, null);
-            if (request.remoteAddress != udp_ip) {
-                var regex = /registerMatch_(\d+)/;
-                if (message.utf8Data.match(regex)) {
-                    data = message.utf8Data.match(regex);
-                    clients['logger'][clientIndex].logger.push(data[1]);
-                }
-                return;
-            }
-            for (var c in clients["logger"]) {
-                if (clients['logger'][c].logger.indexOf(data.id, null) >= 0) {
-                    clients["logger"][c].send(message.utf8Data);
-                }
-            }
-        } else if (mode == "/match") {
-            clientIndex = clients['match'].indexOf(connection, null);
-            if (request.remoteAddress != udp_ip) {
-                var dgram = new Buffer(message.utf8Data);
-                clientUDP.send(dgram, 0, dgram.length, udp_port, udp_ip);
-            }
-            for (var c in clients["match"]) {
-                if (clientIndex == c) {
-                    continue;
-                }
-                clients["match"][c].send(message.utf8Data);
-            }
-        } else if (mode == "/chat") {
-            chatlog.push(message.utf8Data);
-            if (chatlog.length >= 20)
-                chatlog.splice(1, 1);
-            for (var c in clients["chat"]) {
-                clients["chat"][c].send(message.utf8Data);
-                clients["chat"][c].send(clients["chat"].length);
-            }
         }
-    });
+    } catch (e) {
 
-    connection.on('close', function(reasonCode, description) {
-        if (mode == "/alive") {
-            clientIndex = clients['alive'].indexOf(connection, null);
-            clients['alive'].splice(clientIndex, 1);
-        } else if (mode == "/match") {
-            clientIndex = clients['match'].indexOf(connection, null);
-            clients['match'].splice(clientIndex, 1);
-        } else if (mode == "/rcon") {
-            clientIndex = clients['rcon'].indexOf(connection, null);
-            clients['rcon'].splice(clientIndex, 1);
-        } else if (mode == "/logger") {
-            clientIndex = clients['logger'].indexOf(connection, null);
-            clients['logger'].splice(clientIndex, 1);
-            if (clients['logger'].length == 1) {
-                var dgram = new Buffer("__false__");
-                clientUDP.send(dgram, 0, dgram.length, udp_port, udp_ip);
-            }
-        } else if (mode == "/livemap") {
-            clientIndex = clients['livemap'].indexOf(connection, null);
-            clients['livemap'].splice(clientIndex, 1);
-        } else if (mode == "/chat") {
-            clientIndex = clients['chat'].indexOf(connection, null);
-            clients['chat'].splice(clientIndex, 1);
-        }
-        console.log((new Date()) + ' \[' + request.origin + '\] Peer ' + connection.remoteAddress + ' disconnected. (' + mode + ') (#' + clientIndex + ')');
-    });
+    }
+    if (messageObject.scope == "alive") {
+        io.sockets.in('alive').emit('aliveHandler', {data: body});
+    } else if (messageObject.scope == "rcon") {
+        io.sockets.in('rcon-' + data.id).emit('rconHandler', body);
+    } else if (messageObject.scope == "logger") {
+        io.sockets.in('logger-' + data.id).emit('loggerHandler', body);
+        io.sockets.in('loggersGlobal').emit('loggerGlobalHandler', body);
+    } else if (messageObject.scope == "match") {
+        io.sockets.in('matchs').emit('matchsHandler', body);
+    } else if (messageObject.scope == "livemap") {
+        io.sockets.in('livemap-' + data.id).emit('livemapHandler', body);
+    }
 });
+
+udpServer.bind(parseInt(udp_port) + 1, udp_ip);
\ No newline at end of file