WIP
gMerge branch 'master' of github.com:ispiro/cryptogram

WIP