Configuration fix + README
Merge branch 'hotfix/config'