Update to v0.4.16