Configuration refactoring
Merge pull request #55 from franckstauffer/fix

Configuration refactoring