updated to Django 1.5 compatible