Cleaned up headers
Merge pull request #17 from inspiran/master

Cleaned up headers