Bugfix
Merge pull request #23 from ivanzhaowy/master

Bugfix