Updated to contour 2.0.0.rc2