Fix for checkbox
Merge branch 'develop' into feature/poll-tokens
Merge pull request #76 from stevenhillcox/feature/poll-tokens

Fix for checkbox