Updated to v0.8