Upgrade to v0.0.8