Merge pull request #24 from ChrisBoesch/master

update
Merge pull request #256 from ruijunhuang2010/master

Merge pull request #24 from ChrisBoesch/master