change gsub when possible
Merge pull request #1479 from igas/gsub-refactoring

change gsub when possible