Final version
Added Makefile