Merge pull request #231 from gloryming/master

fix wrong words
fix bug