Candidate for v0.2