Upgrade to 0.4.0