Merge pull request #33 from ChrisBoesch/master

update
Merge pull request #280 from ruijunhuang2010/master

Merge pull request #33 from ChrisBoesch/master