Merge pull request #23 from ChrisBoesch/master

update
Merge pull request #255 from ruijunhuang2010/master

Merge pull request #23 from ChrisBoesch/master