Merge pull request #8 from satzcoal/master

merge1113
Merge pull request #7 from xy19xiaoyu/master

merge1113_2