--- ./lightbox.js.dist	2006-04-08 22:58:12.000000000 -0700
+++ ./lightbox.js	2006-04-20 19:46:44.000000000 -0700
@@ -328,7 +328,12 @@
 		// if image is NOT part of a set..
 		if((imageLink.getAttribute('rel') == 'lightbox')){
 			// add single image to imageArray
+                        if (imageLink.getAttribute('target')) {
+                              	imageArray.push(new Array(imageLink.getAttribute('href'), imageLink.getAttribute('title'), imageLink.getAttribute('target')));
+                        }
+                        else {
 			imageArray.push(new Array(imageLink.getAttribute('href'), imageLink.getAttribute('title')));			
+                        }
 		} else {
 		// if image is part of a set..
 
@@ -336,9 +341,15 @@
 			for (var i=0; i<anchors.length; i++){
 				var anchor = anchors[i];
 				if (anchor.getAttribute('href') && (anchor.getAttribute('rel') == imageLink.getAttribute('rel'))){
+                                        if (anchor.getAttribute('target')) {
+                                        	imageArray.push(new Array(anchor.getAttribute('href'), anchor.getAttribute('title'), anchor.getAttribute('target')));
+                                        }
+
+                                        else {
 					imageArray.push(new Array(anchor.getAttribute('href'), anchor.getAttribute('title')));
 				}
 			}
+			}
 			imageArray.removeDuplicates();
 			while(imageArray[imageNum][0] != imageLink.getAttribute('href')) { imageNum++;}
 		}
@@ -372,13 +383,30 @@
 		Element.hide('numberDisplay');		
 		
 		imgPreloader = new Image();
+                var nextImage = imageArray[activeImage][0]
+
+                if (imageArray[activeImage][2]) {
+                        nextImage = imageArray[activeImage][2];
+                }
 		
 		// once image is preloaded, resize image container
 		imgPreloader.onload=function(){
-			Element.setSrc('lightboxImage', imageArray[activeImage][0]);
+
+                        if (imageArray[activeImage][2]) {
+                                container = $('imageContainer')
+                                container.onclick = function () { 
+                                        location.href = imageArray[activeImage][0];
+                                };
+                        	Element.setSrc('lightboxImage', nextImage);
+                        }
+
+                        else {
+                        	Element.setSrc('lightboxImage', nextImage);
+                        }
+
 			myLightbox.resizeImageContainer(imgPreloader.width, imgPreloader.height);
 		}
-		imgPreloader.src = imageArray[activeImage][0];
+		imgPreloader.src = nextImage;
 	},
 
 	//
@@ -457,16 +485,22 @@
 		// if not first image in set, display prev image button
 		if(activeImage != 0){
 			Element.show('prevLink');
-			document.getElementById('prevLink').onclick = function() {
-				myLightbox.changeImage(activeImage - 1); return false;
+			document.getElementById('prevLink').onclick = function(event) {
+				myLightbox.changeImage(activeImage - 1);
+                                event.cancelBubble = true;
+                                if (event.stopPropagation) event.stopPropagation();
+                                return false;
 			}
 		}
 
 		// if not last image in set, display next image button
 		if(activeImage != (imageArray.length - 1)){
 			Element.show('nextLink');
-			document.getElementById('nextLink').onclick = function() {
-				myLightbox.changeImage(activeImage + 1); return false;
+			document.getElementById('nextLink').onclick = function(event) {
+				myLightbox.changeImage(activeImage + 1);         
+                                event.cancelBubble = true;
+                                if (event.stopPropagation) event.stopPropagation();
+                                return false;
 			}
 		}