Minor bugfixes
Merge branch 'master' of https://MirayInel@github.com/jcryptool/crypto.git