Some changes to Makefile
Merge branch 'pr/n26_rkuchumov'