clustering improvements
Merge pull request #7 from TylerBackman/develop

clustering improvements