Merge pull request #243 from cneben/f/#228-tree-layout-algorithm

Merge pull request #243 from cneben/f/#228-tree-layout-algorithm #137