Merge pull request #37 from ChrisBoesch/master

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

update