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

modify some details