added env reading
Merge branch 'env_override'