refactor
Merge pull request #578 from youyong205/master

refactor