Added mailer to fix issue #1