Upgrading to 0.2.5