Now allows e format and NaN numbers.