Merge pull request #245 from matfed/master

MatchableEntity extension and refactoring
Merge branch 'master' of https://github.com/CeON/CoAnSys