Merge pull request #17 from robert-scheck/apache24