Update to 0.4.16