merged with treemapwork2
Merge branch 'submaster' of https://github.com/ungv/tigerfoobar into submaster