Ugh.
Merge pull request #61 from toomuchpete/fix/environment_flag

Ugh.