Add ability to deal with commas in the numeric figures