Merge pull request #1752 from esdrubal/strefactor