Adding WebSocket support.
Merge branch 'websockets'