setup.py fixes. See GH-15.
Merge branch 'kmike-setup.py' into dev