Merge pull request #4 from ChrisBoesch/master

update
Merge pull request #371 from ruijunhuang2010/master

Merge pull request #4 from ChrisBoesch/master