Bugfix
Merge pull request #12 from ivanzhaowy/master

Bugfix