added support for commas