diff --git a/galleria.admin.inc b/galleria.admin.inc
index 52446b9..1e0d6ff 100644
--- a/galleria.admin.inc
+++ b/galleria.admin.inc
@@ -21,6 +21,15 @@ function galleria_admin_settings() {
     '#default_value' => variable_get('galleria_thumb_opacity', 0.3),
     '#description' => t('Value from 0 .. 1'),
   );
+  if (module_exists('node_images'))
+  {
+    $form['galleria_use_node_images'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Use Node Images'),
+      '#default_value' => variable_get('galleria_use_node_images', 0),
+      '#description' => t('Use images attached by node_images module'),
+    );
+  }
 
   // Code based on from Taxonomy Image's ImageCache support
   // If ImageCache module is found, add its presets as available options
diff --git a/galleria.install b/galleria.install
index 164dbcf..5bac3f9 100644
--- a/galleria.install
+++ b/galleria.install
@@ -9,6 +9,7 @@ function galleria_uninstall() {
   variable_del('galleria_show_page_warning');
   variable_del('galleria_imagecache_preset');
   variable_del('galleria_thumb_imagecache_preset');
+  variable_del('galleria_use_node_images');
   $node_types = node_get_types('names');
   foreach ($node_types as $type) {
     variable_del("galleria_$type");
diff --git a/galleria.module b/galleria.module
index c89714d..ce77ded 100644
--- a/galleria.module
+++ b/galleria.module
@@ -63,8 +63,14 @@ function galleria_is_valid($node) {
 
   if (is_object($node)) {
     // are there attachments?
-    if (!empty($node->files)) {
-      if (!($valid = galleria_validate_file_extensions($node->files))) {
+    if (variable_get('galleria_use_node_images', 0) == 1) {
+      $files = node_images_load( $node );
+    }
+    else {
+      $files = $node->files;
+    }
+    if (!empty($files)) {
+      if (!($valid = galleria_validate_file_extensions($files))) {
         galleria_set_message(t('Invalid Galleria: one or more attached files are not images.'), 'error');
       }
     }
@@ -236,7 +242,13 @@ function theme_galleria_lightbox_link($nid, $width, $height, $text) {
  */
 function template_preprocess_galleria(&$vars) {
   $node = $vars['node'];
-  $files = $node->files;
+
+  if (variable_get('galleria_use_node_images', 0) == 1) {
+    $files = node_images_load($node);
+  }
+  else {
+    $files = $node->files;
+  }
   $images = array();
   $i = 0;