Fix config file name
Merge pull request #1 from thejchap/config-file-name-fix

Fix config file name
Merge remote-tracking branch 'upstream/master' into guard-2-compat