add replace-with as per issue #30