See #71, though I think that should be done in a separate PR.