Added Apache 2.4 support, closes #16 and closes #18