Done in #47.