Fix callback argument value to use entity object
Merge pull request #97 from marmelab/callback_consistency

[RFR] Fix callback argument value to use entity object