Fix
Merge pull request #8 from RogerZhangHS/master

Fix