more socket config
merging socket config
Merge branch 'moreSockets'