#251 small improvement in email confirmation
#251 Code review
#251 Fixed typo
Merge branch 'issue_251' into develop