Merge pull request #21 from ChrisBoesch/master

update
Merge pull request #251 from ruijunhuang2010/master

Merge pull request #21 from ChrisBoesch/master