Updated setup.py and windows cmd scripts