Cnrfc

This branch is ready to merge into master.