branch 2.2
unit test
added some checks
updated cf names and added relClasses
merged from branch 2.0.0