Fixed clustering
Merge pull request #32 from barvince5/clusterfix

Fixed clustering