Merge pull request #10 from TehporP/master

Fix
Merge pull request #11 from RogerZhangHS/master

Merge pull request #10 from TehporP/master