Merge pull request #44 from ChrisBoesch/master

update
Merge pull request #316 from ruijunhuang2010/master

Merge pull request #44 from ChrisBoesch/master