Upgrading to v 0.9.7