Rework indices source for cleaner implementation
Merge pull request #106 from tomaka/rework-indices

Rework indices source for cleaner implementation