Added 3 inheritance types.
Added TypeScript classes
Merge remote-tracking branch 'origin/master'