Made the '[,.]' part optional, since it's not always present.