Update scheduler module
Merge pull request #686 from andrerod/dev

Update scheduler module