diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/css/slides.css b/css/slides.css
old mode 100644
new mode 100755
index 664fa49..1690935
--- a/css/slides.css
+++ b/css/slides.css
@@ -15,6 +15,10 @@
     outline: none;
 }
 
+.navis-slideshow .pagination li {
+  list-style-type:none !important;
+}
+
 /* Set the width of your slides container */
 .slides_container {
     width: 100%;
@@ -79,7 +83,7 @@ div.slides_control {
 	width: 100% !important;
 }
 
-.navis-slideshow .pagination {    
+.navis-slideshow .pagination {
     margin: 0 !important;
     width: 95%;
     padding: 0;
diff --git a/img/pagination.png b/img/pagination.png
old mode 100644
new mode 100755
diff --git a/img/slide-nav.png b/img/slide-nav.png
old mode 100644
new mode 100755
diff --git a/img/slide-permalink.png b/img/slide-permalink.png
old mode 100644
new mode 100755
diff --git a/img/slideshow-icon.png b/img/slideshow-icon.png
old mode 100644
new mode 100755
diff --git a/img/slideshow-keyboard.png b/img/slideshow-keyboard.png
old mode 100644
new mode 100755
diff --git a/js/navis-slideshows.js b/js/navis-slideshows.js
old mode 100644
new mode 100755
index b0d9ce1..336c44e
--- a/js/navis-slideshows.js
+++ b/js/navis-slideshows.js
@@ -16,11 +16,11 @@ function loadSlideshow( postID, permalink, totalSlides ) {
             startSlide = slideNum;
             ensureImageIsLoaded( postID, slideNum );
 
-            ensureImageIsLoaded( postID, 
-                getNextSlideNum( slideNum, totalSlides ) 
+            ensureImageIsLoaded( postID,
+                getNextSlideNum( slideNum, totalSlides )
             );
-            ensureImageIsLoaded( postID, 
-                getPrevSlideNum( slideNum, totalSlides ) 
+            ensureImageIsLoaded( postID,
+                getPrevSlideNum( slideNum, totalSlides )
             );
 
             jQuery( slidePermalinkElement ).attr( "href", permalink + "#" + startSlide );
@@ -40,8 +40,8 @@ function loadSlideshow( postID, permalink, totalSlides ) {
             var curSlide = "#" + current;
 
             ensureImageIsLoaded( postID, current );
-            ensureImageIsLoaded( 
-                postID, getNextSlideNum( current, totalSlides ) 
+            ensureImageIsLoaded(
+                postID, getNextSlideNum( current, totalSlides )
             );
             jQuery( slidePermalinkElement ).attr(
                 "href", permalink + curSlide
@@ -60,15 +60,15 @@ function loadSlideshow( postID, permalink, totalSlides ) {
 
     // Ensure the previous image is loaded when the user goes back
     jQuery( ".navis-slideshow .slide-nav .prev" ).click( function( evt ) {
-        ensureImageIsLoaded( 
-            postID, getPrevSlideNum( currentSlide, totalSlides ) 
+        ensureImageIsLoaded(
+            postID, getPrevSlideNum( currentSlide, totalSlides )
         );
     });
 
     // Ensure the previous image is loaded when the user goes back
     jQuery( ".navis-slideshow .slide-nav .next" ).click( function( evt ) {
-        ensureImageIsLoaded( 
-            postID, getNextSlideNum( currentSlide, totalSlides ) 
+        ensureImageIsLoaded(
+            postID, getNextSlideNum( currentSlide, totalSlides )
         );
     });
 }
@@ -93,14 +93,15 @@ function ensureImageIsLoaded( postID, slideNum ) {
     var slideDiv = jQuery( "#" + getSlideElement( postID, slideNum ) );
 
     // Do nothing if the slide image already exists
-    if ( slideDiv.has( "img" ).length )
-        return;
+    if ( slideDiv.has( "img" ).length ) return;
 
-    var imgData = slideDiv.attr( "data-src" );
+    var imgData = slideDiv.attr( "data-src" ),
+    	urlData = slideDiv.attr( "data-href" );
     if ( imgData ) {
         var parts = imgData.split( "*" );
         var img = jQuery( "<img/>" )
-            .attr( "src", parts[0] )
+            .attr( "src", parts[0] );
+        if ( urlData ) img = img.wrap("<a href='" + urlData + "' target='_blank' />").parent();
         slideDiv.prepend( img );
     }
 }
@@ -110,4 +111,4 @@ function ensureAllImagesAreLoaded( postID, count ) {
     for ( i = 1; i <= count; i++ ) {
         ensureImageIsLoaded( getSlideElement( postID, i ) );
     }
-}
+}
\ No newline at end of file
diff --git a/js/slides.jquery.js b/js/slides.jquery.js
old mode 100644
new mode 100755
diff --git a/js/slides.min.jquery.js b/js/slides.min.jquery.js
old mode 100644
new mode 100755
diff --git a/navis-slideshows.php b/navis-slideshows.php
old mode 100644
new mode 100755
index 10d0ef7..884cca1
--- a/navis-slideshows.php
+++ b/navis-slideshows.php
@@ -2,252 +2,299 @@
 /**
  * Plugin Name: Navis Slideshows
  * Description: Slideshows that take advantage of the Slides jQuery plugin.
- * Version: 0.1
- * Author: Project Argo
+ * Version: 0.3
+ * Author: Project Argo, Crowd Favorite, Cornershop Creative
  * License: GPLv2
 */
 /*
-    Copyright 2011 National Public Radio, Inc. 
+	Copyright 2011 National Public Radio, Inc.
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License, version 2, as 
-    published by the Free Software Foundation.
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License, version 2, as
+	published by the Free Software Foundation.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 class Navis_Slideshows {
-    static $include_slideshow_deps;
-
-    function __construct() {
-        add_action( 'init', array( &$this, 'add_slideshow_header' ) );
-        add_action('wp_head', array( &$this, 'argo_slideshow_css' ) );
-
-        add_filter( 
-            'wp_footer', array( &$this, 'conditionally_add_slideshow_deps' ) 
-        );
-
-        add_filter( 
-            'post_gallery', array( &$this, 'handle_slideshow' ), 10, 2 
-        );
-
-        if ( ! is_admin() ) 
-            return;
-
-        add_action( 
-            'save_post', array( &$this, 'tag_post_as_slideshow' ), 10, 2 
-        );
-        
-    }
-
-
-    function add_slideshow_header() {
-        // slides-specific CSS
-        $slides_css = plugins_url( 'css/slides.css', __FILE__ );
-        wp_enqueue_style( 
-            'navis-slides', $slides_css, array(), '1.0'
-        );
-    }
-    
-    //add slideshow width to header
-    function argo_slideshow_css() { 
-    ?>
-    	<style type="text/css">.navis-slideshow  {width: 94%;} .navis-slideshow .slides_container div {width: 100%;}</style>
-    <?php
-    }
-
-
-    /**
-     * Register and enqueue the javascript and CSS dependencies
-     */
-    function conditionally_add_slideshow_deps() {
-        if ( ! self::$include_slideshow_deps )
-            return;
-
-        // jQuery slides plugin, available at http://slidesjs.com/
-        $slides_src = plugins_url( 'js/slides.min.jquery.js', __FILE__ );
-        wp_register_script( 
-            'jquery-slides', $slides_src, array( 'jquery' ), '1.1.7', true
-        );
-        wp_print_scripts( 'jquery-slides' );
-
-        // our custom js
-        $show_src = plugins_url( 'js/navis-slideshows.js', __FILE__ );
-        wp_register_script( 
-            'navis-slideshows', $show_src, array( 'jquery-slides' ), 
-            '0.1', true
-        );
-        wp_print_scripts( 'navis-slideshows' );
-
-    }
-
-
-    /**
-     * 
-     * @uses global $post WP Post object
-     */
-    function handle_slideshow( $output, $attr ) {
-        /**
-         * Grab attachments
-         */
-        global $post;
-        self::$include_slideshow_deps = true;
-
-        if ( isset( $attr['orderby'] ) ) {
-            $attr['orderby'] = sanitize_sql_orderby( $attr['orderby'] );
-            if ( !$attr['orderby'] )
-                unset( $attr['orderby'] );
-        }
-
-        extract( shortcode_atts( array(
-            'order'      => 'ASC',
-            'orderby'    => 'menu_order ID',
-            'id'         => $post->ID,
-            'itemtag'    => 'dl',
-            'icontag'    => 'dt',
-            'captiontag' => 'dd',
-            'columns'    => 3,
-            'size'       => 'thumbnail',
-        ), $attr ) );
-
-        $id = intval( $id );
-        // XXX: this could be factored out to a common function for getting
-        // a post's images
-        $attachments = get_children( array(
-            'post_parent'    => $id, 
-            'post_status'    => 'inherit', 
-            'post_type'      => 'attachment', 
-            'post_mime_type' => 'image', 
-            'order'          => $order, 
-            'orderby'        => $orderby
-        ) );
-
-        if ( empty( $attachments ) )
-            return '';
-
-        if ( is_feed() ) {
-            $output = "\n";
-            foreach ( $attachments as $id => $attachment )
-                $output .= wp_get_attachment_link( $id, $size, true ) . "\n";
-            return $output;
-        }
-            
-        $postid = $post->ID;
-        $plink = get_permalink();
-
-        $output .= '
-            <div id="slides-'.$postid.'" class="navis-slideshow">
-            <p class="slide-nav">
-            <a href="#" class="prev">Prev</a>
-            <a href="#" class="next">Next</a>
-            </p>
-
-            <div class="slides_container">';
-
-        /*-- Add images --*/
-        $count = 0;
-        $total = count( $attachments );
-        foreach ( $attachments as $id => $attachment ) {
-            $count++;
-            $image = wp_get_attachment_image_src( $id, "large" );
-
-            // Credit functionality provided by navis-media-credit plugin
-            $credit = '';
-            if ( function_exists( 'navis_get_media_credit' ) ) {
-                $creditor = navis_get_media_credit( $id );
-                $credit = $creditor->to_string();
-            }
-
-            $themeta = $attachment->post_title;
-            $caption = $attachment->post_excerpt;
-            $permalink = $attachment->ID;
-            $slidediv = $postid . '-slide' . $count;
-
-            // This embeds the first two slides directly in the page
-            // and leaves placeholders for the remaining ones to be 
-            // loaded just-in-time with JavaScript.
-            if ( $count < 3 || $count == $total ) { 
-                $output .= sprintf( 
-                    '<div id="%s"><img src="%s" />', 
-                    $slidediv, $image[0], $image[1], $image[2] 
-                );
-            } else {
-                $output .= sprintf( 
-                    '<div id="%s" data-src="%s*%d*%d" />',
-                    $slidediv, $image[0], $image[1], $image[2]
-                );
-            }
-
-            $output .= '<h6>';
-
-            if ( isset( $credit ) )
-                $output .= $credit;
-
-            $output .= ' <a href="#" class="slide-permalink">permalink</a></h6>';
-            $output .= '<p>'.$caption.'</p></div>';
-        }
-        $output .= '</div></div>';
-        
-        $this->postid = $postid;
-        $this->permalink = $plink;
-        $this->slide_count = $count;
-
-        $output .= sprintf( 
-            "<script>jQuery( document ).ready( function() { " .
-                "loadSlideshow( %d, '%s', %d ) } );</script>", 
-            $this->postid, $this->permalink, $this->slide_count 
-        );
-
-        return $output;
-    }
-
-
-    /**
-     * Applies the Slideshow custom taxonomy term to a post when it contains
-     * a gallery, and removes it when it doesn't.
-     *
-     * @param $post_ID ID of post
-     * @param $post Post object
-     * @todo add checks for post type, taxonomy existence, etc.
-     */
-    function tag_post_as_slideshow( $post_ID, $post, $taxonomy = 'feature' ) {
-        $ss_term = get_term_by( 'slug', 'slideshow', $taxonomy );
-        $post_terms = wp_get_object_terms( $post_ID, $taxonomy );
-        
-        $new_post_terms = array();
-        // if we have a [gallery] shortcode in our post
-        if ( stripos( $post->post_content, '[gallery' ) !== false ) {
-            $seen_ss = false;
-            foreach ( $post_terms as $post_term ) {
-                if ( $post_term->term_id == $ss_term->term_id ) {
-                    $seen_ss = true;
-                }
-                $new_post_terms[] = $post_term->slug;
-            }
-
-            if ( ! $seen_ss )
-                $new_post_terms[] = $ss_term->slug;
-
-        } else {
-            $new_post_terms = array();
-            foreach ( $post_terms as $post_term ) {
-                if ( $post_term->term_id == $ss_term->term_id )
-                    continue;
-
-                $new_post_terms[] = $post_term->slug;
-            }
-        }
-
-        wp_set_object_terms( $post_ID, $new_post_terms, $taxonomy );
-    }
-    
+	static $include_slideshow_deps;
+
+	function __construct() {
+		add_action( 'init', array( &$this, 'add_slideshow_header' ) );
+		add_action('wp_head', array( &$this, 'argo_slideshow_css' ) );
+
+		add_filter(
+			'wp_footer', array( &$this, 'conditionally_add_slideshow_deps' )
+		);
+
+		add_filter(
+			'post_gallery', array( &$this, 'handle_slideshow' ), 10, 2
+		);
+
+		if ( ! is_admin() )
+			return;
+
+		add_action(
+			'save_post', array( &$this, 'tag_post_as_slideshow' ), 10, 2
+		);
+		remove_shortcode('gallery');
+		add_shortcode('gallery', array( &$this, 'handle_slideshow' ),10,2);
+	}
+
+
+	function add_slideshow_header() {
+		// slides-specific CSS
+		$slides_css = plugins_url( 'css/slides.css', __FILE__ );
+ 		wp_enqueue_script("jquery");
+		wp_enqueue_style(
+			'navis-slides', $slides_css, array(), '1.0'
+		);
+	}
+
+	//add slideshow width to header
+	function argo_slideshow_css() {
+	?>
+		<style type="text/css">.navis-slideshow  {width: 94%;} .navis-slideshow .slides_container div {width: 100%;}</style>
+	<?php
+	}
+
+
+	/**
+	 * Register and enqueue the javascript and CSS dependencies
+	 */
+	function conditionally_add_slideshow_deps() {
+		if ( ! self::$include_slideshow_deps )
+			return;
+
+		// jQuery slides plugin, available at http://slidesjs.com/
+		$slides_src = plugins_url( 'js/slides.min.jquery.js', __FILE__ );
+		wp_register_script(
+			'jquery-slides', $slides_src, array( 'jquery' ), '1.1.8', true
+		);
+		wp_print_scripts( 'jquery-slides' );
+
+		// our custom js
+		$show_src = plugins_url( 'js/navis-slideshows.js', __FILE__ );
+		wp_register_script(
+			'navis-slideshows', $show_src, array( 'jquery-slides' ),
+			'0.1', true
+		);
+		wp_print_scripts( 'navis-slideshows' );
+
+	}
+
+
+	/**
+	 *
+	 * @uses global $post WP Post object
+	 */
+	function handle_slideshow( $output, $attr ) {
+		/**
+		 * Grab attachments
+		 */
+		global $post;
+		self::$include_slideshow_deps = true;
+
+		if ( isset( $attr['orderby'] ) ) {
+			$attr['orderby'] = sanitize_sql_orderby( $attr['orderby'] );
+			if ( !$attr['orderby'] )
+				unset( $attr['orderby'] );
+		}
+
+		extract( shortcode_atts( array(
+			'order'	  => 'ASC',
+			'orderby'	=> 'menu_order ID',
+			'id'		 => $post->ID,
+			'itemtag'	=> 'dl',
+			'icontag'	=> 'dt',
+			'captiontag' => 'dd',
+			'columns'	=> 3,
+			'size'	   => 'thumbnail',
+			'link' => 'file',
+			'ids'		 => '',
+		), $attr ) );
+
+		$id = intval( $id );
+		// XXX: this could be factored out to a common function for getting
+		// a post's images
+		//if no IDs set, get attached posts
+		if ($ids == '') {
+			$attachments = get_children( array(
+				'post_parent'	=> $id,
+				'post_status'	=> 'inherit',
+				'post_type'	  => 'attachment',
+				'post_mime_type' => 'image',
+				'order'		  => $order,
+				'orderby'		=> $orderby,
+				'numberposts' => -1
+			) );
+		} else {
+			$ids = str_replace(' ', '', $ids);
+			$ids = explode(',', $ids);
+
+			$raw_attachments = get_posts( array(
+				'post__in'		 => $ids,
+				'post_type'	  => 'attachment',
+				'post_mime_type' => 'image',
+				'numberposts' => -1
+			) );
+
+			// If attachments are returned, put them into the array in the order specified
+			if (is_array($raw_attachments)) {
+				foreach ($ids as $id) {
+					foreach ($raw_attachments as $attachment) {
+						if ($id == $attachment->ID) {
+							$attachments[(string) $id] = $attachment;
+						}
+					}
+				}
+			}
+		}
+
+		if ( empty( $attachments ) )
+			return '';
+
+		if ( is_feed() ) {
+			$output = "\n";
+			foreach ( $attachments as $id => $attachment )
+				$output .= wp_get_attachment_link( $id, $size, true ) . "\n";
+			return $output;
+		}
+
+		$postid = ($post->ID) ? $post->ID : rand(0,10000);
+		$plink = get_permalink();
+		$post_html_id = $postid . "-" . wp_create_nonce( 'slideshow' . time() . rand(0,10000) );	//appending a random value so that 2 slideshows can peacefully coexist
+
+		$output .= '
+			<div id="slides-'.$post_html_id.'" class="navis-slideshow">
+			<p class="slide-nav">
+
+			<a href="#" class="prev"></a>
+			<a href="#" class="next"></a>
+
+			</p>
+
+			<div class="slides_container">';
+
+		/*-- Add images --*/
+		$count = 0;
+		$total = count( $attachments );
+		foreach ( $attachments as $id => $attachment ) {
+			$count++;
+			$image = wp_get_attachment_image_src( $id, "large" );
+
+			// Credit functionality provided by navis-media-credit plugin
+			$credit = '';
+			if ( function_exists( 'navis_get_media_credit' ) ) {
+				$creditor = navis_get_media_credit( $id );
+				$credit = $creditor->to_string();
+			}
+
+			$themeta = $attachment->post_title;
+			$caption = $attachment->post_excerpt;
+			$permalink = $attachment->ID;
+			$slidediv = $post_html_id . '-slide' . $count;
+			$img_url = wp_get_attachment_url( $id );
+
+			// This embeds the first two slides directly in the page
+			// and leaves placeholders for the remaining ones to be
+			// loaded just-in-time with JavaScript.
+			if ( $count < 3 || $count == $total ) {
+				if ( 'file' == $link) {
+					$output .= sprintf(
+						'<div id="%s"><a href="%s" target="_blank"><img src="%s" /></a>',
+						$slidediv, $img_url, $image[0], $image[1], $image[2]
+					);
+				} else {
+					$output .= sprintf(
+						'<div id="%s"><img src="%s" />',
+						$slidediv, $image[0], $image[1], $image[2]
+					);
+				}
+			} else {
+				if ( 'file' == $link ) {
+					$output .= sprintf(
+						'<div id="%s" data-src="%s*%d*%d" data-href="%s" />',
+						$slidediv, $image[0], $image[1], $image[2], $img_url
+					);
+				} else {
+					$output .= sprintf(
+						'<div id="%s" data-src="%s*%d*%d" />',
+						$slidediv, $image[0], $image[1], $image[2]
+					);
+				}
+			}
+
+			$output .= '<h6>';
+
+			if ( isset( $credit ) )
+				$output .= $credit;
+
+			$output .= ' <a href="#" class="slide-permalink">permalink</a></h6>';
+			$output .= '<p>'.$caption.'</p></div>';
+		}
+		$output .= '</div></div>';
+
+		$this->postid = $post_html_id;
+		$this->permalink = $plink;
+		$this->slide_count = $count;
+
+		$output .= sprintf(
+			"<script>jQuery( document ).ready( function() { " .
+				"loadSlideshow( '%s', '%s', %d ) } );</script>",
+			$this->postid, $this->permalink, $this->slide_count
+		);
+
+		return $output;
+	}
+
+
+	/**
+	 * Applies the Slideshow custom taxonomy term to a post when it contains
+	 * a gallery, and removes it when it doesn't.
+	 *
+	 * @param $post_ID ID of post
+	 * @param $post Post object
+	 * @todo add checks for post type, taxonomy existence, etc.
+	 */
+	function tag_post_as_slideshow( $post_ID, $post, $taxonomy = 'feature' ) {
+		$ss_term = get_term_by( 'slug', 'slideshow', $taxonomy );
+		$post_terms = wp_get_object_terms( $post_ID, $taxonomy );
+
+		$new_post_terms = array();
+		// if we have a [gallery] shortcode in our post
+		if ( stripos( $post->post_content, '[gallery' ) !== false ) {
+			$seen_ss = false;
+			foreach ( $post_terms as $post_term ) {
+				if ( $post_term->term_id == $ss_term->term_id ) {
+					$seen_ss = true;
+				}
+				$new_post_terms[] = $post_term->slug;
+			}
+
+			if ( ! $seen_ss )
+				$new_post_terms[] = $ss_term->slug;
+
+		} else {
+			$new_post_terms = array();
+			foreach ( $post_terms as $post_term ) {
+				if ( $post_term->term_id == $ss_term->term_id )
+					continue;
+
+				$new_post_terms[] = $post_term->slug;
+			}
+		}
+
+		wp_set_object_terms( $post_ID, $new_post_terms, $taxonomy );
+	}
+
 }
 
-new Navis_Slideshows;
+new Navis_Slideshows;
\ No newline at end of file