Merge pull request #45 from ChrisBoesch/master

update
Merge pull request #317 from ruijunhuang2010/master

Merge pull request #45 from ChrisBoesch/master