Adding support for CD and DVD for setItemsList
Merge remote-tracking branch 'origin/master'