bz899664
Merge pull request #387 from liweinan/bz899664

bz899664