Update to v0.6