#26 resolved. Added support for non-browser websocket
#26 merged develop