Pushed new commit.  Small limitation is that you can't have a comma inside the key to be replaced.  I favored a simpler regex with this limitation in mind.