Merge pull request #24 from mind1master/master

Indices client