Updated for environment variable fix on Windows