Bug fix #343
Create nodes in treeview only on demand. This speeds up the update process since only part of the tree is built
Merge branch 'Upstream/master'