Merge pull request #22 from ChrisBoesch/master

update
Merge pull request #253 from ruijunhuang2010/master

Merge pull request #22 from ChrisBoesch/master