Merge pull request #42 from ChrisBoesch/master

update
Merge pull request #308 from ruijunhuang2010/master

Merge pull request #42 from ChrisBoesch/master