This fixes #20, previous commits also resolved #25, closed #24 and also got a new Jenkins badge