Pull my branch for latest version of CRoPS