Merge pull request #6 from andresfera/master

Makefile final