Merge pull request #1 from ChrisBoesch/master

update
Merge pull request #359 from ruijunhuang2010/master

Merge pull request #1 from ChrisBoesch/master