Use injected environment
Merge pull request #247 from LeovR/patch-3

Use injected environment