Update for v1.0.0 from rev d52ce89