Connecting with SocketIO, test
Merge fixes