Update master to 2.0.0