amends to cron, remembering if logs are enabled
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
new line character replaced to unix style