adding Makefile for easy updates, updating to upstream version