Added some socket stuff
Merge branch 'master' of https://github.com/zsaraf/lovestep