diff --git a/README.txt b/README.txt
index ce16fae..39e909b 100644
--- a/README.txt
+++ b/README.txt
@@ -62,4 +62,8 @@ of jQuery. No need to alter packaged jQuery plugins!
               // your code here, using jQuery 1.7.1
             })(jQuery)
 
-  
\ No newline at end of file
+  Note: For methods A, B & C above, if you want your jQuery to use the jqmulti
+        version of jQuery, but only when you have specifically loaded the files,
+        for example by using drupal_add_js(), and not on every page, make sure
+        the 'Always load libraries assigned to this version of jQuery' option is
+        un-checked. Otherwise, the libraries/files will be loaded on very page.
diff --git a/jqmulti.admin.inc b/jqmulti.admin.inc
index 1c6e61a..684a349 100644
--- a/jqmulti.admin.inc
+++ b/jqmulti.admin.inc
@@ -37,7 +37,16 @@ function jqmulti_admin_form() {
     '#default_value' => variable_get('jqmulti_load_always', FALSE),
     '#description' => t('Turn this on if you want to use the newer version of jQuery in custom scripts, using the alias provided'),
   );
-  
+
+  $form['jqmulti_load_libraries_always'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Always load libraries assigned to this version of jQuery'),
+    '#default_value' => variable_get('jqmulti_load_libraries_always', FALSE),
+    '#description' => t('Turn this on if you want the libraries assigned to jqmulti jQuery to be loaded on every page.') . '<br />' .
+                      t('Otherwise, the libraries/files will only be loaded if they have been added using a traditional drupal method, for example with drupal_add_js().') . '<br />' .
+                      t('This affects javascript added using the below settings, hook_jqmulti_libraries() or hook_jqmulti_files().'),
+  );
+
   // Find all libraries that are turned on by the hook.
   $available_libraries = jqmulti_get_available_libraries();
   
diff --git a/jqmulti.install b/jqmulti.install
index eaf47fc..d329094 100644
--- a/jqmulti.install
+++ b/jqmulti.install
@@ -14,6 +14,7 @@ function jqmulti_uninstall() {
     'version',
     'libraries',
     'load_always',
+    'load_libraries_always',
   );
   foreach ($vars as $var) {
     variable_del('jqmulti_' . $var);
@@ -45,4 +46,21 @@ function jqmulti_requirements($phase) {
       }
   }
   return $requirements;
-}
\ No newline at end of file
+}
+
+/**
+ * Set the default value for the new option to include libraries assigned to the
+ * jqmulti jQuery library on all pages automatically.
+ *
+ * The logical setting for this on new sites is disabled, however so existing
+ * sites aren't unexpectedly affected, this is enabled to mimic existing
+ * functionality.
+ */
+function jqmulti_update_7101() {
+  variable_set('jqmulti_load_libraries_always', TRUE);
+  // Return a message to the user to alert them to this new setting.
+  return t('The jqmulti module previously always included libraries attached to its version of jQuery on every page.') . '<br />' .
+         t('This is now an option you can enable/disable.') . '<br />' .
+         t('The default for this setting on new sites is disabled, so libraries are not included when they are not needed, however it has now been set to enabled so that the functionality does not suddenly change for existing sites.') . '<br />' .
+         t('You may choose to disable this at the <a href="@url">jqmulti admin settings page</a>.', array('@url' => url('admin/config/system/jqmulti')));
+}
diff --git a/jqmulti.module b/jqmulti.module
index b3d486c..69a9a8e 100644
--- a/jqmulti.module
+++ b/jqmulti.module
@@ -38,6 +38,11 @@ function jqmulti_js_alter(&$javascript) {
   
   // Get info about which files are needed.
   $files = jqmulti_get_files();
+  // Check if we are to add libraries even if they have not already been added.
+  if (!variable_get('jqmulti_load_libraries_always', FALSE)) {
+    $files = array_intersect_key($files, $javascript);
+  }
+  // If there are no files, check if we are to add jQuery anyway.
   if (empty($files)) {
     if (!variable_get('jqmulti_load_always', FALSE)) {
       return;