integrate envvar
Merge pull request #504 from davidchambers/envvar

integrate envvar