#9 Fixed  error with default email in Mailer
Merge remote-tracking branch 'origin/master'