Merge pull request #2 from tedqiao/master

test