Added websocket support
Merge pull request #21 from alexgaudiosi/master

Added websocket support