Added option to chose scale C or F