added support for checkboxes
merged with develop