Start end scheduler options issue 627

Couldn't merge @swilliamset's #914. Manual merged. Made tests pass. Thanks @swilliamset.