Now compatable with Django 1.7