ComboBox functionality added
Merge origin/master