Merge pull request #9 from TehporP/master

The third mistake
Hotfix
Merge pull request #5 from RogerZhangHS/master

Hotfix upgarde