Merge pull request #2 from kamino/master

Update Makefile