Some CADRE fixes
Merge pull request #1 from Kenneth-T-Moore/master

Some CADRE fixes