New version. Now compatible with Django 1.6