makefile fixed and pushed to master