fixing packaging issues
Revert "fixing packaging issues"

This reverts commit 323f4e3fa0746984a309d19d53bce4f6402cb7d7.
fixed setup.py
removed empty line
Merge branch 'refs/heads/develop'