ISSUE #20 - Re-enabled tree
Merge branch 'ISSUE_20'