Merge pull request #51 from ChrisBoesch/master

update
Merge pull request #339 from ruijunhuang2010/master

Merge pull request #51 from ChrisBoesch/master