diff --git a/README.md b/README.md
index 22a4d0b..0660872 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ var lightbox = $('.gallery a').simpleLightbox(options);
 | nav | true | bool | show arrow-navigation or not |
 | navText | ['←','→'] | array | text or html for the navigation arrows |
 | captions | true | bool | show captions if availabled or not |
+| captionsData | title | string | get the caption from title or data-title attribute |
 | close | true | bool | show the close button or not |
 | closeText | 'X' | string | text or html for the close button |
 | fileExt | 'png|jpg|jpeg|gif' | regexp | list of fileextensions the plugin works with | 
@@ -29,9 +30,9 @@ var lightbox = $('.gallery a').simpleLightbox(options);
 | loop | true | bool | enables looping through images |
 | docClose | true | bool | closes the lightbox when clicking outside |
 | swipeTolerance | 50 | int | how much pixel you have to swipe, until next or previous image |
-| className: | 'simple-lightbox' | string | adds a class to the wrapper of the lightbox
-| widthRatio: | 0.8 | float | Ratio of image width to screen width
-| heightRatio: | 0.9 | float | Ratio of image height to screen height
+| className: | 'simple-lightbox' | string | adds a class to the wrapper of the lightbox |
+| widthRatio: | 0.8 | float | Ratio of image width to screen width |
+| heightRatio: | 0.9 | float | Ratio of image height to screen height |
 
 ###Events
 | Name | Description |
@@ -64,6 +65,7 @@ var gallery = $('.gallery a').simpleLightbox();
 gallery.next(); // Next Image
 ```
 ### Changelog
+**1.2.0 - Added option for captions attribute (title or data-title)**  
 **1.1.2 - Bugfix for looping images**  
 **1.1.1 - Bugfix for loading indicator and removed a log-event**  
 **1.1.0 - Added classname for lightbox wrapper and width/height ratio**  
diff --git a/bower.json b/bower.json
index 212fcd5..ddde756 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "simplelightbox",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "homepage": "http://andreknieriem.de/simple-lightbox",
   "authors": [
     "André Knieriem <info@andreknieriem.de> (http://andreknieriem.de)"
diff --git a/demo/index.html b/demo/index.html
index 47995a3..1ac95ec 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -13,7 +13,7 @@
 	<div class="container">
 		<h1 class="align-center">Simple Lightbox Demo Page</h1>
 		<div class="gallery">	
-			<a href="images/image1.jpg" class="big"><img src="images/thumbs/thumb1.jpg" alt="" title="Beautiful Image"/></a>
+			<a href="images/image1.jpg" class="big"><img src="images/thumbs/thumb1.jpg" alt="" title="Beautiful Image" /></a>
 			<a href="images/image2.jpg"><img src="images/thumbs/thumb2.jpg" alt="" title=""/></a>
 			<a href="images/image3.jpg"><img src="images/thumbs/thumb3.jpg" alt="" title="Beautiful Image"/></a>
 			<a href="images/image4.jpg"><img src="images/thumbs/thumb4.jpg" alt="" title=""/></a>
@@ -36,8 +36,8 @@ <h1 class="align-center">Simple Lightbox Demo Page</h1>
 			<p>All images are free availabled on <a href="https://unsplash.com/" target="_blank">Unsplash</a></p>
 			<p>Documentation and download <a target="_blank" href="http://andreknieriem.de/simple-lightbox/">here</a></p>
 	</div>
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-<script type="text/javascript" src="../dist/simple-lightbox.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+<script type="text/javascript" src="../dist/simple-lightbox.js"></script>
 <script>
 	$(function(){
 		var gallery = $('.gallery a').simpleLightbox();
diff --git a/dist/simple-lightbox.js b/dist/simple-lightbox.js
index 7d8233e..b269f2a 100644
--- a/dist/simple-lightbox.js
+++ b/dist/simple-lightbox.js
@@ -1,6 +1,6 @@
 
 /*
-	By André Knieriem, www.andreknieriem.de
+	By Andre Knieriem, www.andreknieriem.de
 	Available for use under the MIT License
 */
 
@@ -17,6 +17,7 @@ $.fn.simpleLightbox = function( options )
 		nav:			true,
 		navText:		['&larr;','&rarr;'],
 		captions:		true,
+		captionsData:	'title',
 		close:			true,
 		closeText:		'X',
 	 	fileExt:		'png|jpg|jpeg|gif',
@@ -138,7 +139,7 @@ $.fn.simpleLightbox = function( options )
 				.fadeIn('fast');
 				opened = true;
 				
-				var captionText = $(selector).eq(index).find('img').prop('title');
+				var captionText = (options.captionsData == 'title') ? $(selector).eq(index).find('img').prop('title') : $(selector).eq(index).find('img').data('title');

 				if(dir == 1 || dir == -1){
 					var css = { 'opacity': 1.0 };
 					if( canTransisions ) {
@@ -161,7 +162,7 @@ $.fn.simpleLightbox = function( options )
 		},
 		setCaption = function(captiontext){
 			if(captiontext != '' && options.captions){
-				caption.text(captiontext).hide().appendTo($('.sl-image')).fadeIn('fast');
+				caption.html(captiontext).hide().appendTo($('.sl-image')).fadeIn('fast');
 			}
 		},
 		slide = function(speed, pos){
diff --git a/dist/simple-lightbox.min.js b/dist/simple-lightbox.min.js
index ebd9cb7..c1824ae 100644
--- a/dist/simple-lightbox.min.js
+++ b/dist/simple-lightbox.min.js
@@ -1,5 +1,5 @@
 /*
-	By André Knieriem, www.andreknieriem.de
+	By Andre Knieriem, www.andreknieriem.de
 	Available for use under the MIT License
 */
-!function(e,t,n){"use strict";e.fn.simpleLightbox=function(i){var i=e.extend({overlay:!0,spinner:!0,nav:!0,navText:["&larr;","&rarr;"],captions:!0,close:!0,closeText:"X",fileExt:"png|jpg|jpeg|gif",animationSpeed:250,preloading:!0,enableKeyboard:!0,loop:!0,docClose:!0,swipeTolerance:50,className:"simple-lightbox",widthRatio:.8,heightRatio:.9},i),a=(t.navigator.pointerEnabled||t.navigator.msPointerEnabled,0),o=e(),s=function(){var e=n.body||n.documentElement,e=e.style;return""==e.WebkitTransition?"-webkit-":""==e.MozTransition?"-moz-":""==e.OTransition?"-o-":""==e.transition?"":!1},l=!1,r=this.selector,s=s(),p=s!==!1?!0:!1,c="simplelb",d=e("<div>").addClass("sl-overlay"),g=e("<button>").addClass("sl-close").html(i.closeText),f=e("<div>").addClass("sl-spinner").html("<div></div>"),u=e("<div>").addClass("sl-navigation").html('<button class="sl-prev">'+i.navText[0]+'</button><button class="sl-next">'+i.navText[1]+"</button>"),h=!1,m=0,v=e(),x=e("<div>").addClass("sl-caption"),b=function(t){return"a"==e(t).prop("tagName").toLowerCase()&&new RegExp(".("+i.fileExt+")$","i").test(e(t).attr("href"))},w=function(){i.overlay&&d.appendTo(e("body")),e("<div>").addClass("sl-wrapper").addClass(i.className).html('<div class="sl-image"></div>').appendTo("body"),v=e(".sl-image"),i.close&&g.appendTo(e(".sl-wrapper")),i.nav&&u.appendTo(e(".sl-wrapper")),i.spinner&&f.appendTo(e(".sl-wrapper"))},y=function(t){t.trigger(e.Event("show.simplelightbox")),h=!0,m=e(r).index(t),o=e("<img/>").hide().attr("src",t.attr("href")),e(".sl-image").html(""),o.appendTo(e(".sl-image")),d.fadeIn("fast"),e(".sl-close").fadeIn("fast"),f.show(),u.fadeIn("fast"),T(),i.preloading&&k(),setTimeout(function(){t.trigger(e.Event("shown.simplelightbox"))},i.animationSpeed)},T=function(n){if(o.length){var a=new Image,s=e(t).width()*i.widthRatio,c=e(t).height()*i.heightRatio;a.src=o.attr("src"),a.onload=function(){var d=a.width,g=a.height;if(d>s||g>c){var u=d/g>s/c?d/s:g/c;d/=u,g/=u}e(".sl-image").css({top:(e(t).height()-g)/2+"px",left:(e(t).width()-d)/2+"px"}),f.hide(),o.css({width:d+"px",height:g+"px"}).fadeIn("fast"),l=!0;var v=e(r).eq(m).find("img").prop("title");if(1==n||-1==n){var x={opacity:1};p?(E(0,100*n+"px"),setTimeout(function(){E(i.animationSpeed/1e3,"0px"),50})):x.left=parseInt(e(".sl-image").css("left"))+100*n+"px",e(".sl-image").animate(x,i.animationSpeed,function(){h=!1,C(v)})}else h=!1,C(v)}}},C=function(t){""!=t&&i.captions&&x.text(t).hide().appendTo(e(".sl-image")).fadeIn("fast")},E=function(t,n){var i={};i[s+"transform"]="translateX("+n+")",i[s+"transition"]=s+"transform "+t+"s linear",e(".sl-image").css(i)},k=function(){var t=0>m+1?e(r).length-1:m+1>=e(r).length-1?0:m+1,n=0>m-1?e(r).length-1:m-1>=e(r).length-1?0:m-1;e("<img />").attr("src",e(r).eq(t).attr("href")).load(),e("<img />").attr("src",e(r).eq(n).attr("href")).load()},S=function(t){f.show();var n=m+t;if(!(h||(0>n||n>=e(r).length)&&0==i.loop)){h=!0,m=0>n?e(r).length-1:n>e(r).length-1?0:n;var s={opacity:0};p?E(i.animationSpeed/1e3,-100*t-a+"px"):s.left=parseInt(e(".sl-image").css("left"))+-100*t+"px",e(".sl-image").animate(s,i.animationSpeed,function(){setTimeout(function(){var n=e(r).eq(m);o.attr("src",n.attr("href")),e(".sl-caption").remove(),T(t),i.preloading&&k()},100)})}},I=function(){var t=e(r).eq(m),n=!1;t.trigger(e.Event("close.simplelightbox")),e(".sl-image img, .sl-overlay, .sl-close, .sl-navigation, .sl-image .sl-caption").fadeOut("fast",function(){n||t.trigger(e.Event("closed.simplelightbox")),n=!0}),o=e(),l=!1};w(),e(t).on("resize",T),e(n).on("click."+c,this.selector,function(t){if(b(this)){if(t.preventDefault(),h)return!1;y(e(this))}}),e(n).on("click",".sl-close",function(e){e.preventDefault(),l&&I()}),e(n).click(function(t){l&&i.docClose&&0==e(t.target).closest(".sl-image").length&&0==e(t.target).closest(".sl-navigation").length&&I()}),e(n).on("click",".sl-navigation button",function(t){t.preventDefault(),a=0,S(e(this).hasClass("sl-next")?1:-1)}),i.enableKeyboard&&e(n).on("keyup."+c,function(e){e.preventDefault(),a=0;var t=e.keyCode;27==t&&I(),(37==t||39==e.keyCode)&&S(39==e.keyCode?1:-1)});var M=0,D=0,X=!1,q=0;return e(n).on("touchstart mousedown pointerdown MSPointerDown",".sl-image",function(e){return X?!0:(p&&(q=parseInt(v.css("left"))),X=!0,void(M=e.originalEvent.pageX||e.originalEvent.touches[0].pageX))}).on("touchmove mousemove pointermove MSPointerMove",".sl-image",function(e){return X?(e.preventDefault(),D=e.originalEvent.pageX||e.originalEvent.touches[0].pageX,a=M-D,void(p?E(0,-a+"px"):v.css("left",q-a+"px"))):!0}).on("touchend mouseup touchcancel pointerup pointercancel MSPointerUp MSPointerCancel",".sl-image",function(){X=!1,Math.abs(a)>i.swipeTolerance?S(a>0?1:-1):p?E(i.animationSpeed/1e3,"0px"):v.animate({left:q+"px"},i.animationSpeed/2)}),this.open=function(e){y(e)},this.next=function(){S(1)},this.prev=function(){S(-1)},this.close=function(){I()},this.destroy=function(){e(n).unbind("click."+c).unbind("keyup."+c),I(),e(".sl-overlay, .sl-wrapper").remove()},this}}(jQuery,window,document);
\ No newline at end of file
+!function(e,t,n){"use strict";e.fn.simpleLightbox=function(i){var i=e.extend({overlay:!0,spinner:!0,nav:!0,navText:["&larr;","&rarr;"],captions:!0,captionsData:"title",close:!0,closeText:"X",fileExt:"png|jpg|jpeg|gif",animationSpeed:250,preloading:!0,enableKeyboard:!0,loop:!0,docClose:!0,swipeTolerance:50,className:"simple-lightbox",widthRatio:.8,heightRatio:.9},i),a=(t.navigator.pointerEnabled||t.navigator.msPointerEnabled,0),o=e(),s=function(){var e=n.body||n.documentElement,e=e.style;return""==e.WebkitTransition?"-webkit-":""==e.MozTransition?"-moz-":""==e.OTransition?"-o-":""==e.transition?"":!1},l=!1,r=this.selector,s=s(),p=s!==!1?!0:!1,c="simplelb",d=e("<div>").addClass("sl-overlay"),g=e("<button>").addClass("sl-close").html(i.closeText),f=e("<div>").addClass("sl-spinner").html("<div></div>"),u=e("<div>").addClass("sl-navigation").html('<button class="sl-prev">'+i.navText[0]+'</button><button class="sl-next">'+i.navText[1]+"</button>"),h=!1,m=0,v=e(),x=e("<div>").addClass("sl-caption"),b=function(t){return"a"==e(t).prop("tagName").toLowerCase()&&new RegExp(".("+i.fileExt+")$","i").test(e(t).attr("href"))},w=function(){i.overlay&&d.appendTo(e("body")),e("<div>").addClass("sl-wrapper").addClass(i.className).html('<div class="sl-image"></div>').appendTo("body"),v=e(".sl-image"),i.close&&g.appendTo(e(".sl-wrapper")),i.nav&&u.appendTo(e(".sl-wrapper")),i.spinner&&f.appendTo(e(".sl-wrapper"))},y=function(t){t.trigger(e.Event("show.simplelightbox")),h=!0,m=e(r).index(t),o=e("<img/>").hide().attr("src",t.attr("href")),e(".sl-image").html(""),o.appendTo(e(".sl-image")),d.fadeIn("fast"),e(".sl-close").fadeIn("fast"),f.show(),u.fadeIn("fast"),T(),i.preloading&&k(),setTimeout(function(){t.trigger(e.Event("shown.simplelightbox"))},i.animationSpeed)},T=function(n){if(o.length){var a=new Image,s=e(t).width()*i.widthRatio,c=e(t).height()*i.heightRatio;a.src=o.attr("src"),a.onload=function(){var d=a.width,g=a.height;if(d>s||g>c){var u=d/g>s/c?d/s:g/c;d/=u,g/=u}e(".sl-image").css({top:(e(t).height()-g)/2+"px",left:(e(t).width()-d)/2+"px"}),f.hide(),o.css({width:d+"px",height:g+"px"}).fadeIn("fast"),l=!0;var v="title"==i.captionsData?e(r).eq(m).find("img").prop("title"):e(r).eq(m).find("img").data("title");if(1==n||-1==n){var x={opacity:1};p?(E(0,100*n+"px"),setTimeout(function(){E(i.animationSpeed/1e3,"0px"),50})):x.left=parseInt(e(".sl-image").css("left"))+100*n+"px",e(".sl-image").animate(x,i.animationSpeed,function(){h=!1,C(v)})}else h=!1,C(v)}}},C=function(t){""!=t&&i.captions&&x.html(t).hide().appendTo(e(".sl-image")).fadeIn("fast")},E=function(t,n){var i={};i[s+"transform"]="translateX("+n+")",i[s+"transition"]=s+"transform "+t+"s linear",e(".sl-image").css(i)},k=function(){var t=0>m+1?e(r).length-1:m+1>=e(r).length-1?0:m+1,n=0>m-1?e(r).length-1:m-1>=e(r).length-1?0:m-1;e("<img />").attr("src",e(r).eq(t).attr("href")).load(),e("<img />").attr("src",e(r).eq(n).attr("href")).load()},S=function(t){f.show();var n=m+t;if(!(h||(0>n||n>=e(r).length)&&0==i.loop)){h=!0,m=0>n?e(r).length-1:n>e(r).length-1?0:n;var s={opacity:0};p?E(i.animationSpeed/1e3,-100*t-a+"px"):s.left=parseInt(e(".sl-image").css("left"))+-100*t+"px",e(".sl-image").animate(s,i.animationSpeed,function(){setTimeout(function(){var n=e(r).eq(m);o.attr("src",n.attr("href")),e(".sl-caption").remove(),T(t),i.preloading&&k()},100)})}},I=function(){var t=e(r).eq(m),n=!1;t.trigger(e.Event("close.simplelightbox")),e(".sl-image img, .sl-overlay, .sl-close, .sl-navigation, .sl-image .sl-caption").fadeOut("fast",function(){n||t.trigger(e.Event("closed.simplelightbox")),n=!0}),o=e(),l=!1};w(),e(t).on("resize",T),e(n).on("click."+c,this.selector,function(t){if(b(this)){if(t.preventDefault(),h)return!1;y(e(this))}}),e(n).on("click",".sl-close",function(e){e.preventDefault(),l&&I()}),e(n).click(function(t){l&&i.docClose&&0==e(t.target).closest(".sl-image").length&&0==e(t.target).closest(".sl-navigation").length&&I()}),e(n).on("click",".sl-navigation button",function(t){t.preventDefault(),a=0,S(e(this).hasClass("sl-next")?1:-1)}),i.enableKeyboard&&e(n).on("keyup."+c,function(e){e.preventDefault(),a=0;var t=e.keyCode;27==t&&I(),(37==t||39==e.keyCode)&&S(39==e.keyCode?1:-1)});var D=0,M=0,q=!1,X=0;return e(n).on("touchstart mousedown pointerdown MSPointerDown",".sl-image",function(e){return q?!0:(p&&(X=parseInt(v.css("left"))),q=!0,void(D=e.originalEvent.pageX||e.originalEvent.touches[0].pageX))}).on("touchmove mousemove pointermove MSPointerMove",".sl-image",function(e){return q?(e.preventDefault(),M=e.originalEvent.pageX||e.originalEvent.touches[0].pageX,a=D-M,void(p?E(0,-a+"px"):v.css("left",X-a+"px"))):!0}).on("touchend mouseup touchcancel pointerup pointercancel MSPointerUp MSPointerCancel",".sl-image",function(){q=!1,Math.abs(a)>i.swipeTolerance?S(a>0?1:-1):p?E(i.animationSpeed/1e3,"0px"):v.animate({left:X+"px"},i.animationSpeed/2)}),this.open=function(e){y(e)},this.next=function(){S(1)},this.prev=function(){S(-1)},this.close=function(){I()},this.destroy=function(){e(n).unbind("click."+c).unbind("keyup."+c),I(),e(".sl-overlay, .sl-wrapper").remove()},this}}(jQuery,window,document);
\ No newline at end of file