Added option to accept comma in a Token