fixed emails
Merge origin/master