socket stuff
Merge branch 'socket'