Merge pull request #595 from youyong205/master

refactor
Merge pull request #597 from youyong205/master

refactor