working on emails
Merge pull request #108 from uditk/master

working on emails