Improve Django 1.6 compatibility.
Merge pull request #4 from skorokithakis/patch-1

Improve Django 1.6 compatibility.