UPDATE: Use single replace instead of two
Merge pull request #2 from camspiers/trim-change

UPDATE: Use single replace instead of two