Fixes #3
Merge pull request #8 from pandrew/3-email-credentials

Fixes #3