mailer
Merge pull request #2 from Therni/some-other-branch

mailer