Updating to tag v0.6