Limit number of mail
Merge branch 'develop'