1.7 working
Merge branch 'master' of https://github.com/danshaffer/crypto