Better makefile for packaging, Call this 0.6