refactor
Merge pull request #437 from youyong205/master

refactor