Merge pull request #1 from graulund/master

Merging
Fix header issue and update to 1.0.5
Merge pull request #7 from aaronpearce/master

Fixes issues related to header height change