changes to setup.py and add Makefile