fixed config perf and mix issues
Merge pull request #1 from jarnoux/master

fixed config perf and mix issues