modify some details
Merge remote branch 'upstream/master'
modify some details
Merge pull request #20 from lucknessbuaa/master

modify some details