Config files for more customization
Merge branch 'refactoring'