Header cleanup
Merge pull request #206 from mvala/master

Header cleanup