Updated for release v1.2.0