Make Entities developer-friendly
Merge pull request #52 from azyobuzin/fix/entities

Make Entities developer-friendly