Makefile and joaninhas.c updated; test script added