Update to v0.9.4