fix bug
Merge pull request #1 from dongzha/origin/master

fix bug