checkboxes validation, fixes #9
Merge branch 'master' into Refactoring-files