Improved the email message
Merge branch 'develop'