This should probably wait until your PR 197 is merged.