Merge pull request #587 from bradymiller/standard-header