Added makefile; Minor fixes; Changed gitignore;