- added another option for config file lookup
Merge remote-tracking branch 'github/master'