Merge branch 'master' of https://github.com/Andreas-Bur/Java-WebSocket into bug-834