Merge pull request #9 from ChrisBoesch/master

update
Merge pull request #389 from ruijunhuang2010/master

Merge pull request #9 from ChrisBoesch/master