Fix environment variable endpoints
Merge pull request #138 from smcgivern/env_var_endpoints

Fix environment variable endpoints