modify some bugs
Merge remote branch 'upstream/master' into dev
Merge pull request #20 from lucknessbuaa/master

modify some bugs