Fixed discrepancy between real and testing environment
Merge branch 'master' of https://github.com/calvinliang/email-sender