wip
Merge
Merge remote-tracking branch 'origin/master' into Encryption&Email-Refactor
Merge pull request #4 from paulmarsy/Encryption&Email-Refactor

Encryption&email refactor