diff --git a/json-path/src/main/java/com/jayway/jsonpath/Configuration.java b/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
index b60ca78a..1e19081e 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
@@ -26,6 +26,9 @@ import java.util.Set;
import static com.jayway.jsonpath.internal.Utils.notNull;
import static java.util.Arrays.asList;
+/**
+ * Immutable configuration object
+ */
public class Configuration {
private static Defaults DEFAULTS = new Defaults() {
@@ -62,55 +65,103 @@ public class Configuration {
private Configuration(JsonProvider jsonProvider, MappingProvider mappingProvider, EnumSet