Added Support for django 1.5 and higher