fix bug and edit email message
Merge branch 'develop'