Merge pull request #281 from astern7/master

minor + configuration file