Updated to 2.1

CertCafe Client Review style changes