Fixes MAT-4
Merge pull request #4 from edx/dcs/mat-4

Fixes MAT-4