Merge pull request #6 from satzcoal/master

merge1027
Merge pull request #6 from xy19xiaoyu/master

Merge pull request #6 from satzcoal/master