Changed makefile for new version