Merge pull request #50 from permalife/master

Merge pull request #49 from permalife/danny
header fix
header
Merge pull request #51 from permalife/danny

Danny