Upgrade to 0.5