diff --git a/.travis.yml b/.travis.yml
index ca2ba85..d41a13b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ before_install:
 install:
   - ln -s $PWD /usr/local/share/arduino/libraries/WiFiManager
   - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs
-  - arduino --install-library "ArduinoJson"
+  - arduino --install-library "ArduinoJson:5.13.2"
   - arduino --install-boards esp8266:esp8266
   - arduino --pref "compiler.warning_level=all" --save-prefs
 # install esp32
diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index f0ad474..aee5e0c 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -148,6 +148,22 @@ bool WiFiManager::addParameter(WiFiManagerParameter *p) {
   return true;
 }
 
+/**
+ * [getParameters description]
+ * @access public
+ */
+WiFiManagerParameter** WiFiManager::getParameters() {
+  return _params;
+}
+
+/**
+ * [getParametersCount description]
+ * @access public
+ */
+int WiFiManager::getParametersCount() {
+  return _paramsCount;
+}
+
 /**
  * --------------------------------------------------------------------------------
  *  WiFiManager 
diff --git a/WiFiManager.h b/WiFiManager.h
index 2d92247..4485f5f 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -200,6 +200,10 @@ class WiFiManager
     void          setSaveConfigCallback( std::function<void()> func );
     //adds a custom parameter, returns false on failure
     bool          addParameter(WiFiManagerParameter *p);
+    //returns the list of Parameters
+    WiFiManagerParameter** getParameters();
+    // returns the Parameters Count
+    int           getParametersCount();
     //if this is set, it will exit after config, even if connection is unsuccessful.
     void          setBreakAfterConfig(boolean shouldBreak);
     // if this is set, portal will be blocking and wait until save or exit, 
diff --git a/examples/Old Examples/AutoConnectWithFeedback/AutoConnectWithFeedback.ino b/examples/Old_examples/AutoConnectWithFeedback/AutoConnectWithFeedback.ino
similarity index 100%
rename from examples/Old Examples/AutoConnectWithFeedback/AutoConnectWithFeedback.ino
rename to examples/Old_examples/AutoConnectWithFeedback/AutoConnectWithFeedback.ino
diff --git a/examples/Old Examples/AutoConnectWithReset/AutoConnectWithReset.ino b/examples/Old_examples/AutoConnectWithReset/AutoConnectWithReset.ino
similarity index 100%
rename from examples/Old Examples/AutoConnectWithReset/AutoConnectWithReset.ino
rename to examples/Old_examples/AutoConnectWithReset/AutoConnectWithReset.ino
diff --git a/examples/Old Examples/AutoConnectWithStaticIP/AutoConnectWithStaticIP.ino b/examples/Old_examples/AutoConnectWithStaticIP/AutoConnectWithStaticIP.ino
similarity index 100%
rename from examples/Old Examples/AutoConnectWithStaticIP/AutoConnectWithStaticIP.ino
rename to examples/Old_examples/AutoConnectWithStaticIP/AutoConnectWithStaticIP.ino
diff --git a/examples/Old Examples/AutoConnectWithTimeout/AutoConnectWithTimeout.ino b/examples/Old_examples/AutoConnectWithTimeout/AutoConnectWithTimeout.ino
similarity index 100%
rename from examples/Old Examples/AutoConnectWithTimeout/AutoConnectWithTimeout.ino
rename to examples/Old_examples/AutoConnectWithTimeout/AutoConnectWithTimeout.ino