up to date
mailer works
Merge branch 'add-mailer'