Merge pull request #38 from ChrisBoesch/master

update
Merge pull request #297 from ruijunhuang2010/master

Merge pull request #38 from ChrisBoesch/master