Merged with code changes

Tested with apache 2.4.6