Bugfix
Merge pull request #7 from ivanzhaowy/master

Bugfix