Merge pull request #1 from jzz4012650/master

merge code