#26 resolved. Added support for non-browser websocket