tree 3.0 updates
Merge pull request #404 from dwaltz/3.0.0-wip

tree 3.0 updates