Fixes to jobs
Merge pull request #4 from pmorie/refactor

Fixes to jobs