New patch
Merge pull request #20 from Facyla/patch-2

Check for correct entity type