Fixed a couple of warnings
Added Makefile for easy packaging