Fix email functionality
Merge branch 'master' into fix-email
Merge pull request #65 from QuillyT/fix-email

Fix email