Merge pull request #3 from FedeG/master

Setup.py