Merge pull request #28 from ChrisBoesch/master

update
Merge pull request #267 from ruijunhuang2010/master

Merge pull request #28 from ChrisBoesch/master