added email functionality
Merge branch 'email'