Correcting setup.py and Makefile