Bugfix.
Merge pull request #21 from ivanzhaowy/master

Bugfix.