Update makefile
Merge with upstream