Merge pull request #335 from rostafiychuk/master

ENTITY_TYPE deleted