fix List changes
Merge branch 'master' into fix-list-changes
update for M4
Merge pull request #64 from a14n/fix-list-changes

fix List changes