Env variables #16

Merged
merged 4 commits into from Mar 6, 2014