Update to 0.17