Master merge changes

Edited header class and removed php comments (from master merge)