Hydrates with its own entity instance
Merge pull request #1 from i-xperts/master

Hydrates with its own entity instance
[#1] CS fixes

- trailing whitespace
Merge branch 'hotfix/1'

Close #1