MatchableEntity extension and refactoring
Merge pull request #245 from matfed/master

MatchableEntity extension and refactoring