Merge pull request #40 from ChrisBoesch/master

update
HOTFIX #3
Merge pull request #138 from LI-HE/master

HOTFIX #3