Merge pull request #294 from mimmi20/master

reduce inheritance levels