Fixed emails
Merge pull request #15 from novoalg/master

Merge pull request #12 from alephtwo/master
Merge pull request #13 from alephtwo/master

Ben's changes