Merge pull request #3 from zhenjiaWang/master

Merge pull request #7 from sun-zhao/master
Merge pull request #10 from sun-zhao/master

Merge pull request #3 from zhenjiaWang/master123