Merge pull request #5 from dieg0-/master

Merge pull request #7 from petiteargen/master
Reading correct config file
Merge pull request #8 from petiteargen/master

Reading correct config file