Fixed alignments issues in the header

Fixes #45