Please review branch feature/makefile