ticket: 6 Makefile modified