Propagate sub-class addition through the class tree
Merge pull request #996 from gzm0/tree-add-classes

Propagate sub-class addition through the class tree