Bugfix
Merge pull request #22 from ivanzhaowy/master

Bugfix