Merge "Fix Makefile"