Hot fix mailer Merge pull request #21 from Jackiebibili/hot-fix (#22)
Merge pull request #20 from Jackiebibili/develop Hot fix