fix websockets

Otto Visserrequested to merge
websockets into development

Merge request reports