Merge pull request #50 from ChrisBoesch/master

update
Merge pull request #336 from ruijunhuang2010/master

Merge pull request #50 from ChrisBoesch/master