Merge pull request #2 from ChrisBoesch/master

update
Merge pull request #360 from ruijunhuang2010/master

Merge pull request #2 from ChrisBoesch/master