Some small recoding
Merge pull request #237 from nitrous24/master

recoded some things and added job_change check