Add server to publish results of stream
Merge sockets branch into master