Few minor changes on the socket connection
Merge branch 'develop'