Merge pull request #12 from relentlesscoder/revert-11-feature-evaluator

Revert 11 feature evaluator