rebase witih upstream master
Merge pull request #2 from nknol/Fix/ConfigChanges

[RFR] Fix/ConfigChanges