Readded inherits, unbreaking tests
Version bump