Updated for release v1.0.0