Merge pull request #1 from JingzKing/master

test push
TestMerge