Merge pull request #631 from youyong205/master

format code