#115 - changes insertion of defaultOption to be outside of opt_label loo...

...p and adds test

I've changed the defaultOption to be handled outside of the looping of all provided opt_labels.