Merge pull request #144 from bitol-io/header