Fix a bug with checkboxes in GUI
Merge branch 'master' into feature/evaluation