Merge pull request #15 from ChrisBoesch/master

update
Merge pull request #232 from ruijunhuang2010/master

Merge pull request #15 from ChrisBoesch/master