more flexible Entity
DRYing the entity name parsing
Merge branch 'pr/83'