Update to 0.18

Update to 0.18