Add mail stuff
Merge pull request #29 from jaccarmac/mail

Add mail stuff