Upgrade to 0.5.7