This is based off of pull request #10 from @athieriot. Thanks for the idea! I've implemented it as a flag and an environment variable that can be enabled. I've also added another test to handle the environment variable.
