Lucy's first touch
fix a typo
Merge pull request #21 from lfu/master

cherry pick Lucy's 5.1.0.x changes