Updated for release v0.3