Added makefile (and plus)