refactor code
Merge pull request #654 from youyong205/master

refactor code