Merge pull request #25 from ChrisBoesch/master

update
Merge pull request #444 from ruijunhuang2010/master

Merge pull request #25 from ChrisBoesch/master