Continuing work on 0.0.12-dev