Fix entity creation
Merge pull request #70 from marmelab/fix_creation

[RFR] Fix entity creation