Reissue: Fixed #15.

Reissuing #18 against the dev branch.