Merge pull request #12 from ChrisBoesch/master

update
Merge pull request #223 from ruijunhuang2010/master

Merge pull request #12 from ChrisBoesch/master