Changed Makefile for new version