Renamed files
Added test socket
Merge branch 'master' of https://github.com/starand/cpp