Added websockets
Tweaked websockets
Merge pull request #61 from korczis/devel

Devel