Updated to v0.6.0