Upgrading to 0.1.7