Preg replace if ejsag.
Merge branch 'develop'