Added websockets support
Merged