Merge pull request #554 from youyong205/master

sort the code
Merge pull request #555 from youyong205/master

sort the code