Merge pull request #1 from Yao-Zhang/Branch_1

Pull from master to Branch 1
Merge pull request #2 from Yao-Zhang/master

Merge pull request #1 from Yao-Zhang/Branch_1