Merge pull request #34 from ChrisBoesch/master

update
Merge pull request #281 from ruijunhuang2010/master

Merge pull request #34 from ChrisBoesch/master