makefile added
makefile added
fix makefile
merge