A merging of PICOLA and CM_HALOFINDER