Fixed socket.io issues
Merged