Updated to support django 1.4