Updated setup.py and requirements