Update Makefile
Merge pull request #1 from andreaceccanti/develop

Update Makefile