Merge pull request #5 from ChrisBoesch/master

update
Merge pull request #375 from ruijunhuang2010/master

Merge pull request #5 from ChrisBoesch/master