basic type
Merge remote-tracking branch 'origin/master' into tree_manager_type
Merge pull request #89 from liip-forks/tree_manager_type

Tree manager type