Make clearer the naming conflict in PyPI (closes #681)
Merge pull request #682 from toresbe/patch-1

Make clearer the naming conflict in PyPI (closes #681)