refator code
Merge pull request #471 from youyong205/master

refator code