Improved setup.py
Updated environment variable in setup.py