merge #1

Open
p28690714 wants to merge 6 commits from p28690714/PHengLEI-TestCases:master into master

6 Commits