Done in #86.