Closes #380
Merge pull request #388 from bellotastudios/graded-by

Closes #380