Improved regex
Merged conflicts