updated to work with django 1.6