Spec and makefile

Improved pull request for the SPEC and the Makefile.