Split configuration
Merge pull request #247 from sandermarechal/configuration

Split configuration