Better handling of non-overlapping jobs and Fixes #52