Will do once #53 is merged!