New websocket version
Merge pull request #691 from vbmithr/master

New version of websocket