Some bug fixes related to handling the lists.
Merge branch 'master' of https://github.com/catia92/SO_1314V_Series