Bug fix for issue #23
Rename EntityMarshal to Entity
Resolved composer.json conflict