Merge pull request #1 from themainframe/master

Pulling to fix some bugs
Update gen_mail_headline.php

Removed extra 's's at the end of objects and made them capitals
Merge pull request #2 from xepps/master

Slight tweak