Update final

This time I use make, it should be ok
Merge pull request #63 from mgesto/master

Update final