Merge pull request #22 from wagnert/master

Switch to new web socket server