modify the code
modify the config
Merge pull request #514 from youyong205/master

refator code