Fix: #17 - email error handling
Fix: #27
Merge branch 'develop'