Fixes #651
Merge pull request #652 from hyperunknown/checkbox-class

Fixes #651