diff --git a/library/src/com/twotoasters/clusterkraf/ClustersBuilder.java b/library/src/com/twotoasters/clusterkraf/ClustersBuilder.java
index 8866a1c..c4bdb4d 100644
--- a/library/src/com/twotoasters/clusterkraf/ClustersBuilder.java
+++ b/library/src/com/twotoasters/clusterkraf/ClustersBuilder.java
@@ -98,13 +98,17 @@ ArrayList<ClusterPoint> build() {
 			clusteredPoints = new ArrayList<ClusterPoint>(relevantInputPointsList.size());
 			for (InputPoint point : relevantInputPointsList) {
 				boolean addedToExistingCluster = false;
-				for (ClusterPoint clusterPoint : clusteredPoints) {
-					if (clusterPoint.getPixelDistanceFrom(point) <= options.getPixelDistanceToJoinCluster()) {
-						clusterPoint.add(point);
-						addedToExistingCluster = true;
-						break;
+				
+				if (options.isClusterEnabled()) {
+					for (ClusterPoint clusterPoint : clusteredPoints) {
+						if (clusterPoint.getPixelDistanceFrom(point) <= options.getPixelDistanceToJoinCluster()) {
+							clusterPoint.add(point);
+							addedToExistingCluster = true;
+							break;
+						}
 					}
 				}
+				
 				if (addedToExistingCluster == false) {
 					clusteredPoints.add(new ClusterPoint(point, projection, false));
 				}
diff --git a/library/src/com/twotoasters/clusterkraf/Options.java b/library/src/com/twotoasters/clusterkraf/Options.java
index 458be9d..f10df29 100644
--- a/library/src/com/twotoasters/clusterkraf/Options.java
+++ b/library/src/com/twotoasters/clusterkraf/Options.java
@@ -42,6 +42,11 @@ public class Options {
 	 */
 	private double expandBoundsFactor = DEFAULT_EXPAND_BOUNDS_FACTOR;
 
+	/**
+	 * Enable or disable clustering
+	 */
+	private boolean clusterEnabled = true;
+	
 	/**
 	 * The MarkerOptionsChooser to use for customizing MarkerOptions objects.
 	 */
@@ -116,7 +121,21 @@ public class Options {
 	/**
 	 * 
 	 */
-	private ProcessingListener processingListener;
+	private ProcessingListener processingListener;	
+	
+	/**
+	 * @return clusterEnabled
+	 */
+	public boolean isClusterEnabled() {
+		return clusterEnabled;
+	}
+
+	/**
+	 * @param clusterEnabled
+	 */
+	public void setClusterEnabled(boolean clusterEnabled) {
+		this.clusterEnabled = clusterEnabled;
+	}
 
 	/**
 	 * @return the transitionDuration