Added default config options
Merge remote-tracking branch 'origin/master'