Setup.py fixes
Merge branch 'master' of https://github.com/Adastra-thw/Tortazo