Added jar capability, cleaning in makefile