Well, that seemed to… easy. In the end anyway.

Fixed #31.