improved directory handling
implemented adding of directories as subtree
Merge branch 'devel'