Upgrade to v0.3.1