upgraded
added search replace
Merge branch 'dev'