Update to 0.18