Updated for release v0.4