Improved cron template
auto-merge staging into master