DRMP Fixes
Merge pull request #544 from michaelhowden/master

DRMP Requirements changes