some more FIXESSSSS MUHAHAHAHA
Merge branch 'master' of https://github.com/suthernfriend/ssh.git