fixbug
Merge pull request #2 from zhenhu/master

fixbug