Modified email code
Merge remote branch 'origin'