Refactor methodoverride to make it easier to inherit and extend
Merge pull request #687 from dwilkie/master

Refactor methodoverride to make it easier to inherit and extend