Clearer docu and warning (RJD vs JD confusion)
Bug fix, RJD vs JD confusion