Merge pull request #40 from ChrisBoesch/master

update
Merge pull request #300 from ruijunhuang2010/master

Merge pull request #40 from ChrisBoesch/master