Headers
Merge pull request #9 from TheOleg/master

Headers mostly done