Some improvements: Makefile + wrapper script