Update List Fix
Merge branches 'master' and 'list'