Fancy .h class
Merge pull request #981 from guardian/h-class

Better .h class