Added .h references.
Merge remote-tracking branch 'origin/master'
Fixed inheritance.