fixing issue #97

Now able to merge as well.
It would be good to put this behind a preference, so you can leave it on for local dev and testing, but turn it off for staging and production