Fixing socket, preventing socket spawning
Merge branch 'master' of https://github.com/stevelacy/claru