Merge pull request #46 from permalife/master

to danny
feedback, header changes
conflict resolution
Merge pull request #47 from permalife/danny

Danny