More efficient EntityId construction
Merge pull request #219 from wmde/setid

More efficient EntityId construction