New version that is compatible with Django 1.5