Add support for websocket connections
Fix indentation problems