fix bugs.
Merge branch 'masterwzp'