mapclustering now fixed
merging mapsclustering with origin master