Added support for integers > 9 and floats