Header refactored
Merge pull request #16 from TaviscaSolutions/master

Header refactored