Added Makefile and implemented options