Merge pull request #39 from ChrisBoesch/master

update
hotfix
Merge pull request #136 from LI-HE/master

hotfix