Regex date
Merge fix