Upgrade to 0.2.18
WIP