Refactored to add better failure handling
Merge branch 'master' of https://github.com/sripadsriram/JobRunner