add datetime in scheduling
Merge branch 'bugfixes'