Updated for release v0.1