Fixing setup.py (passes: python setup.py test)
Merge pull request #96 from chadlung/master

Fixing setup.py (passes: python setup.py test)
Merge remote-tracking branch 'upstream/master'