Merge pull request #18 from RoadRunnr/master

fix socket logic