Update issue 208
Merge branch 'websocket_support'