minor
Merge remote-tracking branch 'upstream/master'
Replace configuration file
Merge pull request #281 from astern7/master

minor + configuration file