Refactored ExpertExtender
Merge pull request #123 from wmde/expertextenderrefactoring

Refactored ExpertExtender