Updated to v0.7.0