Merge pull request #29 from ChrisBoesch/master

update
Merge pull request #269 from ruijunhuang2010/master

Merge pull request #29 from ChrisBoesch/master