minimakefile branch merged