SOme changes
Merge branch 'master' of git@github.com:Maestro1337/ssha.git