Merge pull request #41 from ChrisBoesch/master

update
Merge pull request #303 from ruijunhuang2010/master

Merge pull request #41 from ChrisBoesch/master