Update to 0.1.18