Updated for release v0.2