Merge pull request #3 from jemartti/master

Maintenance
Basics of socket fixes