client can now connect to echo.websocket.org
merge master changes