debug for previous commit
Merge pull request #368 from LI-HE/master

debug for previous commit