Merge branch 'master' of https://github.com/TooTallNate/Java-WebSocket into fixtypo