Upgrade to apm 0.97