Distinguish between global and matrix environment variables.
Merge pull request #1 from Wilduck/master

Distinguish between global and matrix environment variables.