Added support for an environment variable
Added default value for environment variable