Candidate for 1.0.1