Added configuration file to settings
Merge branch 'settings'