Merge pull request #3 from arjrGuanYi/test930

Test930 to dev_gyzy