Preparing for release to 2.0.0