Fixes a bug in the setup.py file. Resolves #17.
Merge branch 'develop'