Updated setup.py for version 2.0