Fixes #1 - design WebSocket