Merge branch 'makefilefix'