Merge pull request #6 from apanda/master

New schedulers