Updated to work with django 1.5