Merge pull request #17 from ShiWeitq/master

test_Merge ,ok