Merge pull request #4 from ncollins/master

Replaced entityMap Dict with list of tuples