Update for v1.0.1 from rev 25e1f32