Added Nigel's new code
Added ComboBox to select term
Merged with branch master