Added initial version of websockets
merge