Fixed setting background of header methods
Fixed logic for returning correct type of path
Merge remote-tracking branch 'origin/master'