Merge pull request #48 from ChrisBoesch/master

update
Merge pull request #331 from ruijunhuang2010/master

Merge pull request #48 from ChrisBoesch/master