In that case, we can merge #15 and I'll pull and deal with the merge conflicts.