Fixed regex to allow . and _