cfm updates from Anne
Merge branch 'master' of github.com:nikAleksandr/CIC