Merge pull request #24 from mertenvg/master

Fixed issue #23 and rename to Entity