Merge pull request #1 from jeremycate/master

Merge pull request #1 from ixiaoshayu/master