Getting ready for v2.0.0