diff --git a/geophp.module b/geophp.module
index d8faac5..7cc18eb 100644
--- a/geophp.module
+++ b/geophp.module
@@ -1,55 +1,100 @@
-<?php
-
-/**
-* Loads the geoPHP library.
-*
-* @return
-*   Returns TRUE when successful, FALSE otherwise.
-*/
-function geophp_load() {
-  static $static_cache = FALSE;
-  
-  if (!$static_cache) {
-    if (class_exists('geoPHP')) {
-      // something else (likely geofield) already loaded geoPHP
-      $static_cache = TRUE;
-    }
-    else {
-      $path = drupal_get_path('module', 'geophp');
-      $file = $path . '/geoPHP/geoPHP.inc';
-      if (file_exists($file)) {
-        if (include_once($file)) {
-          $static_cache = $file;
-        }
-      }
-    }
-  }
-  
-  return $static_cache;
-}
-
-/**
-* Implementation of hook_requirements().
-*/
-function geophp_requirements($phase) {
-  $requirements = array();
-  
-  $geophp = geophp_load();
-  
-  if (geoPHP::geosInstalled()) {
-    $requirements['geophp'] = array(
-      'title' => t('GeoPHP and GEOS'),
-      'severity' => REQUIREMENT_OK,
-      'value' => t('GEOS PHP extension Installed'),
-    );
-  }
-  else {
-    $requirements['geophp'] = array(
-      'title' => t('GeoPHP and GEOS'),
-      'severity' => REQUIREMENT_INFO,
-      'value' => t('GeoPHP library installed and OK. However, GEOS is was not found. While not required, you will see performance improvements if you install the GEOS PHP extension. See the following link for more information.') . l('https://github.com/phayes/geoPHP/wiki/GEOS', 'https://github.com/phayes/geoPHP/wiki/GEOS'),
-    );
-  }
-  
-  return $requirements;
-}
+<?php
+
+/**
+* Loads the geoPHP library.
+*
+* @return
+*   Returns the filename of the included geoPHP library when successful, FALSE
+*   otherwise.
+*/
+function geophp_load() {
+  static $static_cache = FALSE;
+  
+  if (!$static_cache) {
+    if (class_exists('geoPHP')) {
+      $static_cache = TRUE;
+    }
+    
+    if (module_exists('libraries')) {
+      $path = libraries_get_path('geoPHP');
+      $file = $path . '/geoPHP.inc';
+      if (file_exists($file) && $static_cache !== TRUE) {
+        if (include_once($file)) {
+          $static_cache = $file;
+        }
+      }
+      else {
+        $static_cache = $file;
+      }
+    }
+    // If other options don't exist, load module's copy of geoPHP.
+    if (!$static_cache) {
+      $path = drupal_get_path('module', 'geophp');
+      $file = $path . '/geoPHP/geoPHP.inc';
+      if (file_exists($file)) {
+        if (include_once($file)) {
+          $static_cache = $file;
+        }
+      }
+    }
+  }
+  
+  return $static_cache;
+}
+
+/**
+* Implementation of hook_requirements().
+*/
+function geophp_requirements($phase) {
+  $requirements = array();
+  $local_geophp_version = '0.7'; // @TODO: Find more elegant way to handle this. Load from local library?
+  
+  $geophp = geophp_load();
+  if ($geophp) {
+    try {
+      $geophp_version = geoPHP::version();
+    }
+    catch (Exception $e) {
+      $geophp_version = 0;
+    }
+    if ($geophp_version < $local_geophp_version) {
+      $requirements['geophp'] = array(
+        'title' => t('Old GeoPHP Library'),
+        'severity' => REQUIREMENT_INFO,
+        'value' => t('GeoPHP library version %library_version was found, but you are running an old version. GeoPHP version %local_version is bundled with this module. Please either remove or update your older version of geoPHP found at %path. The newest version of geoPHP can be found at %link.', array('%library_version' => $geophp_version, '%local_version' => $local_geophp_version, '%path' => $geophp, '%link' => 'https://github.com/downloads/phayes/geoPHP/geoPHP.tar.gz')),
+      );
+    }
+    else {
+      $requirements['geophp'] = array(
+        'title' => 'GeoPHP Library Installed',
+        'severity' => REQUIREMENT_OK,
+        'value' => t('GeoPHP %version library installed at %path', array('%path' => $geophp, '%version' => geoPHP::version())),
+      );
+    }
+
+    // GEOS check.
+    if (geoPHP::geosInstalled()) {
+      $requirements['geophp_geos'] = array(
+        'title' => t('GeoPHP and GEOS'),
+        'severity' => REQUIREMENT_OK,
+        'value' => t('GEOS PHP extension Installed'),
+      );
+    }
+    else {
+      $requirements['geophp_geos'] = array(
+        'title' => t('GeoPHP and GEOS'),
+        'severity' => REQUIREMENT_INFO,
+        'value' => t('GeoPHP library installed and OK. However, GEOS is was not found. While not required, you will see performance improvements if you install the GEOS PHP extension. See the following link for more information.') . l('https://github.com/phayes/geoPHP/wiki/GEOS', 'https://github.com/phayes/geoPHP/wiki/GEOS'),
+      );
+    }
+  }
+  else {
+    $requirements['geophp'] = array(
+      'title' => t('GeoPHP and GEOS'),
+      'severity' => REQUIREMENT_ERROR,
+      'value' => t('GeoPHP library was not found. Please either restore this module to a stable release or download a copy of geoPHP at %link and place in the libraries directory.', array('%link' => 'https://github.com/downloads/phayes/geoPHP/geoPHP.tar.gz')),
+    ); 
+  }
+
+  return $requirements;
+}