added entity iterator support
Merge branch 'entity-iterator'