add a mailer class
merge remote