socket additions
Merge pull request #2 from gabofratta/master

go socket!