Forgot to include modified makefile in last commit