Adding Makefile + bugfix