Resolving merge conflict in setup.py

This pull-request is related to the issue #17, posted by myself.