Updated to v0.6