ComboBox gefixt dankzij JARI.
Merge origin/master