Merge pull request #9 from iantocristian/master

post nodemailer upgrade fixes, various fixes