Upgrade to 0.6.*