Make websocket works
Merge