provide feature and follow header conventions
Merge pull request #1 from tarsius/master

provide feature and follow header conventions