websockets
Merge pull request #1 from mbakhoff/websockets

Merge websockets