+ Added 2 parameters for hiding empty sub/peer categories (without any
items in their subtree)
Merge remote-tracking branch 'origin/master'