Merge pull request #3 from ChrisBoesch/master

update
Merge pull request #367 from ruijunhuang2010/master

Merge pull request #3 from ChrisBoesch/master