Merge pull request #47 from ChrisBoesch/master

update
Merge pull request #326 from ruijunhuang2010/master

Merge pull request #47 from ChrisBoesch/master