Updated to be compatible with django 1.5