Refactoring patch from #58.
Merge pull request #139 from elliotttf/master

Support websockets
Merge pull request #3 from hoisie/master

Adding Websockets