add options to TreeView
Merge branch 'master' into gh-pages