Merge pull request #8 from Manarabdelaty/makefile_fixes

Update Makefile