more on config file
Merge remote-tracking branch 'origin/mackenza/release-1.1.0' into mackenza/release-1.1.0
finished config file