Merge Master with Mailer

Adding send mail functionality