Merge between 2.0.0 and 1.0.0