Refactor configuration tree
Merge pull request #44 from Masadow/refactor/config

Refactor configuration tree