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

Support websockets