Getting ready for 2.0 release