Fix for DRF 3.x

Hi,
I wanted to start with DRF 3.0 but I found some issues, so I decided to fix them in order to make it working with the latest version of DRF. 
If you think it requires additional work let me know (maybe it needs some backward compatibility) :)