Close #367 - Fix incorrect replacing of path separators outside of paths
Code tweaks
Update CHANGELOG.md