New version of websocket (Makefile fixed)
Merge pull request #568 from vbmithr/master

New version of websocket