Update to v0.5.8