Bugfix
Merge pull request #15 from ivanzhaowy/master

Bugfix