An improved procedure to assess the organic biodegradability and the biomethane potential of organic wastes for anaerobic digestion