New style, small fixes in code
Merge branch 'master' of https://github.com/R4ndom/GeneratorPasswordsAndCDKeys