Merge branch 'fancy_treeview'