Added checkboxes
Merge branch 'dev'