Preparing for 2.0 release