Merge pull request #245 from rbrito/fix-makefile