Merge pull request #39 from mcamou/master

Cleanup load_*_attributes
Alias resolve_entity method to get