Merge pull request #43 from ChrisBoesch/master

update
Merge pull request #313 from ruijunhuang2010/master

Merge pull request #43 from ChrisBoesch/master