Replaced name-based index with uid
Merge pull request #9 from jan64/master

Replaced name-based index with uid