modified makefile
Merge branch 'makefile'