The rest of the of lookupEnv patch
Merge pull request #11 from stepcut/arafura

Thank's!