updated with new setup.py and makefile