Merge pull request #259 from ruijunhuang2010/master

update
Merge pull request #26 from ChrisBoesch/master

Merge pull request #259 from ruijunhuang2010/master