add config
Merge branch 'config'