Merge pull request #64 from hamishforbes/master

Header util regex fixes