Add Mac Header pull request #18 (re-merge)

re-merge of #18