addressed Anton's findings
Merge branch 'master' of github.com-oleweidner:oleweidner/BigJobSimple
Merge branch 'master' of github.com-oleweidner:oleweidner/BigJobSimple