Upgrading to 0.6.0