fixed setup
Merge branch 'devel' of github.com-oleweidner:oleweidner/BigJobAsync into devel