index identifiers better
Merge pull request #37 from bcail/master

index identifiers better