Updated setup.py and the documentation