Extended config
Builder refactoring
Merge pull request #1 from proxyfabio/master

Builder refacrtoring