Pile of fixes
Merge branch 'master' of github.com:Elizacat/socky
Remove dead variable