Resolving merge conflict in setup.py
Merge pull request #18 from rcaferraz/issue17

Resolving merge conflict in setup.py