adapting code to django 1.7