code cleanup: using extends
Merge branch 'master' of https://github.com/OliverLeitner/OPF