Merge pull request #21 from lucknessbuaa/master

modify the tablist
modify some bugs
Merge remote branch 'upstream/master'