Added unique emails
Merge branch 'develop'