Akshah123 apache plugin

Finally got around to merging the apache plugin changes into master.