Flatten hierarchy improvements
Merge pull request #1 from JulianRooze/master

Flatten hierarchy improvements