Edits to the makefiles
Merge pull request #2 from nicola-gigante/master

Edits to the makefiles