Upgrade to 0.3.5