ISSUE #20 - Proper split of viewer and tree
Merge branch 'ISSUE_20' into ISSUE_28