Merge pull request #270 from ruijunhuang2010/master

update
Merge pull request #31 from ChrisBoesch/master

Merge pull request #270 from ruijunhuang2010/master