Merge pull request #18 from ChrisBoesch/master

update
Merge pull request #242 from ruijunhuang2010/master

Merge pull request #18 from ChrisBoesch/master