amend some logic
Merge branch 'master' of https://github.com/iris4thLab/treeview