Config refactoring
Merge pull request #272 from dlu-gs/feature/config-refact

Config refactoring