Merge branch 'develop' of https://github.com/axlm/Entity into develop

* 'develop' of https://github.com/axlm/Entity: