Upgrading to 0.0.7