Better handling of label output for checkboxes.
Merged in PR#58 with a slight change to the way labels are found