fix
Merge pull request #99 from malmuki/Francois

fix
-performance update in select entity
Merge pull request #100 from malmuki/Francois

-performance update in select entity
Merge pull request #101 from malmuki/dev

Dev