Django 1.6 compatibility
Merge pull request #11 from Wirzi/patch-1

Django 1.6 compatibility