Better support for multiple entities
Merge pull request #15 from vjnrv/patch-3

Better support for multiple entities