Bugfix
Merge pull request #28 from ivanzhaowy/master

Bugfix