fix the some bug
Merge remote-tracking branch 'wm/feature/newdocs' into fix2
Merge pull request #8 from SunLn/fix2

fix some bug