added support for multiple emails.
Merge branch 'local'
fixed bug
Merge branch 'local'
fixed bug
Merge branch 'local'