[Ticket #2] Improve Makefile