Simple clustering - index support
Merge pull request #473 from rishwanthavr/master

Simple clustering - index support