Added socket support
Merge remote-tracking branch 'origin/master'
Fixed conflict