Merge Request for env var

See !13 (merged)

CC: @andymaks

Thanks.