Added some numeric parsing capability