Fix websocket url
Merge branch 'working'