Bugfix
Merge pull request #17 from ivanzhaowy/master

Bugfix