small refactoring in configuration
Merge pull request #16 from M6Web/feature/better-timeout-configuration

small refactoring in configuration