Trial submit
Merge pull request #4 from Sun77789/master

Trial submit
Fixed conflicts