Merge pull request #23 from wagnert/master

Switch to new web socket server