Merge pull request #219 from shahyar/development

SMTP and error handling fixes
Fix typo in SMTP regex