Email stuff
Merge pull request #226 from sadasilva/master

Email stuff