Merge pull request #3 from zhenjiaWang/master123

Merge pull request #7 from sun-zhao/master123