synced Makefile with previous commit