Update setup.py
Merge branch 'robbwagoner-patch-1'

Merging pull request 2