(You can merge #212 onto this commit, I'm going to be accepting that pull request along with this one.)