Initial commit
Merge origin/master
Updated email class commenting and comment style