Upgrade to 0.9.8