Merge pull request #4 from lindak01/master

merge pages
Merge pull request #5 from lindak01/flat-hierarchy

Merge pull request #4 from lindak01/master