avoid overriding settings
Merge pull request #8 from MasseGuillaume/master

avoid overriding settings