Devel code for Sockets provider

Updated Makefile
Merge branch 'master' into devel