Bug fix.
Merge pull request #33 from ivanzhaowy/master

Bug fix.