Bugfix.
Merge pull request #24 from ivanzhaowy/master

Bugfix.