Hmm the diff is strange here (#24 is merged). Maybe a rebasing here helps...