Merge pull request #7 from ChrisBoesch/master

update
Merge pull request #384 from ruijunhuang2010/master

Merge pull request #7 from ChrisBoesch/master