Merge pull request #100 from C4K3/scheduler-timing