Upgrade for 0.3.1