Closes #523
Merge pull request #531 from bellotastudios/grade-scheme-security

Closes #523