Address comments
Merge branch 'scheduler' of https://github.com/Locu/kronos into scheduler