Older version of sockets that works now also client
Merge remote-tracking branch 'origin/master'