Update to be consistent with DRF
Merge pull request #1 from jpulec/master

Update to be consistent with DRF