Updated setup.py
Updated setup script