Add email support
Merge pull request #1 from christianbundy/master

Add email support