modify some bugs
Merge remote branch 'upstream/master'
Merge pull request #26 from lucknessbuaa/master

modify bugs