Set env variable immediately in cli
Minor tweaks from feedback
Merge pull request #152 from wpreul/master

Set env variable immediately in cli