Added superclasses, clean up inherted mehtods
(Jan Kerkenhoff)
Merge origin/dev into dev