Merge pull request #27 from ChrisBoesch/master

update
minor change
Merge pull request #262 from ruijunhuang2010/master

update