Updated for release 0.10.0