updates from wallace
Merge branch 'master' of https://github.com/djsimmonds/wallace-cron