header and stuffs
Merge pull request #27 from jaredentin/master

header and stuffs