Measuring Salinity in crude oils: Evaluation of methods and an improved procedure