Merge pull request #1 from ScottSun/master

test