Added more items
fixed conflict after pull erequest
Merge branch 'elodlukacs-master'