almost working, websocket is returning null for some reasons
Merge remote-tracking branch 'origin/master'