Added some headers
shorten some names
shorten some names
Merge pull request #1 from DrDeath/master

Merge the master to the feature/Cron_reminder