Added new delimiter '.' and fixing not-matching regex problem