Added Comments
Merge branch 'TestEmailService'