Merge pull request #52 from ChrisBoesch/master

update
Merge pull request #343 from ruijunhuang2010/master

Merge pull request #52 from ChrisBoesch/master