initial commit
fixes
Whitespace
test
Merge branch 'subtrees/rich' into rich

* subtrees/rich:
  test
  Whitespace
  fixes
  initial commit