Merge pull request #377 from jeffwilcox/dev

Updating Scheduler client