Update master to v2.0.0