[Ticket #2] Improve Makefile
Merge branch 'dev'