Merge pull request #421 from dwaltz/3.0.0-wip

scheduler 3.0.0