personal config for master branch
Merge branch 'config'