Bugfix
Merge pull request #13 from ivanzhaowy/master

Bugfix