Upgrade to rig v0.4