Closes #348
Merge pull request #349 from bellotastudios/mass-grade-select

Closes #348