Updated setup.py and requirements.txt