Changed Makefile and setup.py