Format parsing now handles commas

Should fix issue #290.