Merging vanilla kmeans into master