fixed bugs in list
Merge branch 'origin/master'