tweaked for shuffle (still working...)
Merge branch 'master' of github.com:obaratch/websocket.proxy into shuffle
shuffle tweaked