Updated to contour 2.2.0.rc2