Adding makefile + bugfix