Merge pull request #4 from joejoejo/fixes

Fixes
Merge pull request #5 from joejoejo/fixes

Update Makefile (reverted from commit 288a02ec8dfa965a90895280f5971cc781...
Merge pull request #6 from joejoejo/master

fixed httpd