modify configurations
Merge branch 'master' of https://github.com/taoyag/config

merged