Pull request 96 lps 30514

Hey Minhchau,

James told me he has been communicating with you regarding this one.
If you can review officially and send to Brian, that would be great.

Somehow, the formatting with the replace stuff looks odd to me, but I don't want to break stuff, so leave that up to you...