Merge "Fix makefile"