diff --git a/dist/index.html b/dist/index.html
index 875cdda..dfa17fa 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -22,6 +22,9 @@
                 color: #2645FF;
                 text-decoration: none;
             }
+            .demo {
+
+            }
         </style>
         <title>Chocolat — demo</title>
         <script>
@@ -51,11 +54,11 @@
     </head>
     <body>
         <div style="text-align: center;background: #E8E8E8; padding: 10px;margin-bottom: 10px;">
-            <a href="https://github.com/nicolas-t/Chocolat"> on github</a>
+            <a href="https://github.com/nicolas-t/Chocolat"> Chocolat on github</a>
         </div>
 
         <h2>
-           Full window, contain: 
+           Full window, contain, click the numbers to open:
         </h2>
         <div id="example0">
             <a class="chocolat-image" href="demo-images/5.jpg" title="HO">
@@ -70,7 +73,7 @@ <h2>
         </div>
 
         <h2>
-            Full window, cover, looping : 
+            Full window, cover, looping :
         </h2>
         <div id="example1">
             <a class="chocolat-image" href="demo-images/1.jpg" title="foo">
@@ -82,7 +85,7 @@ <h2>
         </div>
 
         <h2>
-            Display in a container, cover, with thumbnails :  
+            Display in a container, cover, with thumbnails :
         </h2>
 
         <div id="example3" data-chocolat-title="set title">
@@ -97,10 +100,10 @@ <h2>
             </a>
         </div>
         <!-- Container (notice the relative width) :  -->
-        <div id="container2" style="width: 80%; max-width:1000px; height: 600px;background: #E0E0E0;margin:auto;"></div>
+        <div id="container2" style="width: 80%; max-width:1000px; height: 600px; background: #E0E0E0; margin:auto;"></div>
 
         <h2>
-            Display in a container, looping :  
+            Display in a container, looping :
         </h2>
 
         <div id="example2" data-chocolat-title="set title">
@@ -115,7 +118,7 @@ <h2>
             </a>
         </div>
         <!-- Container (notice the relative width) :  -->
-        <div id="container1" style="width: 80%; max-width:1000px; height: 600px;background: #E0E0E0;margin:auto;"></div>
+        <div id="container1" style="width: 80%; max-width:1000px; height: 600px; background: #E0E0E0; margin:auto;"></div>
 
 
         <h2>
@@ -127,14 +130,14 @@ <h2>
         <a class="api-next" href="#">Next</a>
         <a class="api-prev" href="#">Prev</a>
         <br>
-        <a class="api-cover" href="#">Enter cover mode</a> / 
+        <a class="api-cover" href="#">Enter cover mode</a> /
         <a class="api-contain" href="#">Enter contain mode</a>
 
         <br>
         <br>
         <a class="api-close" href="#">Close</a>
         <!-- Container (notice the relative width) :  -->
-        <div id="container3" style="width: 80%; max-width:1000px; height: 600px;background: #E0E0E0;margin:auto;"></div>
+        <div id="container3" style="width: 80%; max-width:1000px; height: 600px; background: #E0E0E0; margin:auto;"></div>
 
         <script>
             $(function(){
@@ -143,7 +146,7 @@ <h2>
                     loop: true,
                     images : [
                         {src : 'demo-images/1.jpg', title : 'caption 1'},
-                        {src : 'demo-images/6.jpg', title : 'caption 2'}, 
+                        {src : 'demo-images/6.jpg', title : 'caption 2'},
                         {src : 'demo-images/8.jpg', title : 'caption 3'},
                     ],
                     imageSize : 'contain',
diff --git a/dist/js/jquery.chocolat.js b/dist/js/jquery.chocolat.js
index fe886b2..62fed6f 100644
--- a/dist/js/jquery.chocolat.js
+++ b/dist/js/jquery.chocolat.js
@@ -19,7 +19,7 @@
         initialized       : false,
         timer             : false,
         timerDebounce     : false,
-        images            : []
+        images            : [],
     };
 
     function Chocolat(element, settings) {
@@ -28,12 +28,23 @@
         this.settings  = settings;
         this._defaults = defaults;
         this.elems     = {};
+        this.element   = element;
+
+        this._cssClasses = [
+            'chocolat-open',
+            'chocolat-mobile',
+            'chocolat-in-container',
+            'chocolat-cover',
+            'chocolat-zoomable',
+            'chocolat-zoomed'
+        ];
 
         if (!this.settings.setTitle && element.data('chocolat-title')) {
             this.settings.setTitle = element.data('chocolat-title');
         }
 
-        element.find(this.settings.imageSelector).each(function () {
+
+        this.element.find(this.settings.imageSelector).each(function () {
             that.settings.images.push({
                 title  : $(this).attr('title'),
                 src    : $(this).attr('href'),
@@ -42,10 +53,10 @@
             });
         });
 
-        element.find(this.settings.imageSelector).each(function (i) {
-            $(this).off('click').on('click', function(event){
+        this.element.find(this.settings.imageSelector).each(function (i) {
+            $(this).off('click.chocolat').on('click.chocolat', function(e){
                 that.init(i);
-                event.preventDefault();
+                e.preventDefault();
             });
         });
 
@@ -299,7 +310,7 @@
             ];
             var that = this;
             var def = $.when($(els).fadeOut(200)).done(function () {
-                that.elems.domContainer.removeClass('chocolat-open chocolat-mobile chocolat-in-container chocolat-cover');
+                that.elems.domContainer.removeClass(this._cssClasses.join(' '));
             });
             this.settings.currentImage = false;
             this.settings.initialized = false;
@@ -307,6 +318,22 @@
             return def;
         },
 
+        destroy : function() {
+            this.element.removeData();
+            this.element.find(this.settings.imageSelector).off('click.chocolat');
+
+            if (!this.settings.initialized) {
+                return;
+            }
+            if (this.settings.fullscreenOpen) {
+                this.exitFullScreen();
+            }
+            this.settings.currentImage = false;
+            this.settings.initialized = false;
+            this.elems.domContainer.removeClass(this._cssClasses.join(' '));
+            this.elems.wrapper.remove();
+        },
+
         getOutMarginW : function() {
             var left  = this.elems.left.outerWidth(true);
             var right = this.elems.right.outerWidth(true);
@@ -651,6 +678,10 @@
                     return that.place(that.settings.currentImage, that.settings.duration);
                 },
 
+                destroy : function(){
+                    return that.destroy();
+                },
+
                 set : function(property, value){
                     that.settings[property] = value;
                     return value;
diff --git a/dist/js/jquery.chocolat.min.js b/dist/js/jquery.chocolat.min.js
index e60f069..b1860ab 100644
--- a/dist/js/jquery.chocolat.min.js
+++ b/dist/js/jquery.chocolat.min.js
@@ -1 +1 @@
-!function(t,e,i,s){function n(e,i){var s=this;return this.settings=i,this._defaults=a,this.elems={},!this.settings.setTitle&&e.data("chocolat-title")&&(this.settings.setTitle=e.data("chocolat-title")),e.find(this.settings.imageSelector).each(function(){s.settings.images.push({title:t(this).attr("title"),src:t(this).attr("href"),height:!1,width:!1})}),e.find(this.settings.imageSelector).each(function(e){t(this).off("click").on("click",function(t){s.init(e),t.preventDefault()})}),this}var o=0,a={container:e,imageSelector:".chocolat-image",className:"",imageSize:"default",initialZoomState:null,fullScreen:!1,loop:!1,linkImages:!0,duration:300,setTitle:"",separator2:"/",setIndex:0,firstImage:0,lastImage:!1,currentImage:!1,initialized:!1,timer:!1,timerDebounce:!1,images:[]};t.extend(n.prototype,{init:function(t){return this.settings.initialized||(this.setDomContainer(),this.markup(),this.events(),this.settings.lastImage=this.settings.images.length-1,this.settings.initialized=!0),this.load(t)},preload:function(e){var i=t.Deferred();if("undefined"!=typeof this.settings.images[e]){var s=new Image;return s.onload=function(){i.resolve(s)},s.src=this.settings.images[e].src,i}},load:function(e){var i=this;if(this.settings.fullScreen&&this.openFullScreen(),this.settings.currentImage!==e){this.elems.overlay.fadeIn(800),this.settings.timer=setTimeout(function(){"undefined"!=typeof i.elems&&t.proxy(i.elems.loader.fadeIn(),i)},800);var s=this.preload(e).then(function(t){return i.place(e,t)}).then(function(t){return i.appear(e)}).then(function(t){i.zoomable()}),n=e+1;return"undefined"!=typeof this.settings.images[n]&&this.preload(n),s}},place:function(t,e){var i,s=this;return this.settings.currentImage=t,this.description(),this.pagination(),this.arrows(),this.storeImgSize(e,t),i=this.fit(t,s.settings.container),this.center(i.width,i.height,i.left,i.top,0)},center:function(t,e,i,s,n){return this.elems.content.css("overflow","visible").animate({width:t,height:e,left:i,top:s},n).promise()},appear:function(t){var e=this;clearTimeout(this.settings.timer),this.elems.loader.stop().fadeOut(300,function(){e.elems.img.attr("src",e.settings.images[t].src)})},fit:function(e,i){var s,n,o=this.settings.images[e].height,a=this.settings.images[e].width,l=t(i).height(),r=t(i).width(),c=this.getOutMarginH(),h=this.getOutMarginW(),g=r-h,m=l-c,u=m/g,f=l/r,d=o/a;return"cover"==this.settings.imageSize?f>d?(s=l,n=s/d):(n=r,s=n*d):"native"==this.settings.imageSize?(s=o,n=a):(d>u?(s=m,n=s/d):(n=g,s=n*d),"default"===this.settings.imageSize&&(n>=a||s>=o)&&(n=a,s=o)),{height:s,width:n,top:(l-s)/2,left:(r-n)/2}},change:function(t){this.zoomOut(0),this.zoomable();var e=this.settings.currentImage+parseInt(t);if(e>this.settings.lastImage){if(this.settings.loop)return this.load(0)}else{if(!(0>e))return this.load(e);if(this.settings.loop)return this.load(this.settings.lastImage)}},arrows:function(){this.settings.loop?t([this.elems.left[0],this.elems.right[0]]).addClass("active"):this.settings.linkImages?(this.settings.currentImage==this.settings.lastImage?this.elems.right.removeClass("active"):this.elems.right.addClass("active"),0===this.settings.currentImage?this.elems.left.removeClass("active"):this.elems.left.addClass("active")):t([this.elems.left[0],this.elems.right[0]]).removeClass("active")},description:function(){var t=this;this.elems.description.html(t.settings.images[t.settings.currentImage].title)},pagination:function(){var t=this,e=this.settings.lastImage+1,i=this.settings.currentImage+1;this.elems.pagination.html(i+" "+t.settings.separator2+e)},storeImgSize:function(t,e){"undefined"!=typeof t&&(this.settings.images[e].height&&this.settings.images[e].width||(this.settings.images[e].height=t.height,this.settings.images[e].width=t.width))},close:function(){if(this.settings.fullscreenOpen)return void this.exitFullScreen();var e=[this.elems.overlay[0],this.elems.loader[0],this.elems.wrapper[0]],i=this,s=t.when(t(e).fadeOut(200)).done(function(){i.elems.domContainer.removeClass("chocolat-open chocolat-mobile chocolat-in-container chocolat-cover")});return this.settings.currentImage=!1,this.settings.initialized=!1,s},getOutMarginW:function(){var t=this.elems.left.outerWidth(!0),e=this.elems.right.outerWidth(!0);return t+e},getOutMarginH:function(){return this.elems.top.outerHeight(!0)+this.elems.bottom.outerHeight(!0)},markup:function(){this.elems.domContainer.addClass("chocolat-open "+this.settings.className),"cover"==this.settings.imageSize&&this.elems.domContainer.addClass("chocolat-cover"),this.settings.container!==e&&this.elems.domContainer.addClass("chocolat-in-container"),this.elems.wrapper=t("<div/>",{"class":"chocolat-wrapper",id:"chocolat-content-"+this.settings.setIndex}).appendTo(this.elems.domContainer),this.elems.overlay=t("<div/>",{"class":"chocolat-overlay"}).appendTo(this.elems.wrapper),this.elems.loader=t("<div/>",{"class":"chocolat-loader"}).appendTo(this.elems.wrapper),this.elems.content=t("<div/>",{"class":"chocolat-content"}).appendTo(this.elems.wrapper),this.elems.img=t("<img/>",{"class":"chocolat-img",src:""}).appendTo(this.elems.content),this.elems.top=t("<div/>",{"class":"chocolat-top"}).appendTo(this.elems.wrapper),this.elems.left=t("<div/>",{"class":"chocolat-left"}).appendTo(this.elems.wrapper),this.elems.right=t("<div/>",{"class":"chocolat-right"}).appendTo(this.elems.wrapper),this.elems.bottom=t("<div/>",{"class":"chocolat-bottom"}).appendTo(this.elems.wrapper),this.elems.fullscreen=t("<span/>",{"class":"chocolat-fullscreen"}).appendTo(this.elems.bottom),this.elems.description=t("<span/>",{"class":"chocolat-description"}).appendTo(this.elems.bottom),this.elems.pagination=t("<span/>",{"class":"chocolat-pagination"}).appendTo(this.elems.bottom),this.elems.setTitle=t("<span/>",{"class":"chocolat-set-title",html:this.settings.setTitle}).appendTo(this.elems.bottom),this.elems.close=t("<span/>",{"class":"chocolat-close"}).appendTo(this.elems.top)},openFullScreen:function(){var t=this.elems.wrapper[0];t.requestFullscreen?(this.settings.fullscreenOpen=!0,t.requestFullscreen()):t.mozRequestFullScreen?(this.settings.fullscreenOpen=!0,t.mozRequestFullScreen()):t.webkitRequestFullscreen?(this.settings.fullscreenOpen=!0,t.webkitRequestFullscreen()):t.msRequestFullscreen?(t.msRequestFullscreen(),this.settings.fullscreenOpen=!0):this.settings.fullscreenOpen=!1},exitFullScreen:function(){i.exitFullscreen?(i.exitFullscreen(),this.settings.fullscreenOpen=!1):i.mozCancelFullScreen?(i.mozCancelFullScreen(),this.settings.fullscreenOpen=!1):i.webkitExitFullscreen?(i.webkitExitFullscreen(),this.settings.fullscreenOpen=!1):this.settings.fullscreenOpen=!0},events:function(){var s=this;t(i).off("keydown.chocolat").on("keydown.chocolat",function(t){s.settings.initialized&&(37==t.keyCode?s.change(-1):39==t.keyCode?s.change(1):27==t.keyCode&&s.close())}),this.elems.wrapper.find(".chocolat-right").off("click.chocolat").on("click.chocolat",function(){s.change(1)}),this.elems.wrapper.find(".chocolat-left").off("click.chocolat").on("click.chocolat",function(){return s.change(-1)}),t([this.elems.overlay[0],this.elems.close[0]]).off("click.chocolat").on("click.chocolat",function(){return s.close()}),this.elems.fullscreen.off("click.chocolat").on("click.chocolat",function(){return s.settings.fullscreenOpen?void s.exitFullScreen():void s.openFullScreen()}),s.settings.backgroundClose&&this.elems.overlay.off("click.chocolat").on("click.chocolat",function(){return s.close()}),this.elems.wrapper.find(".chocolat-img").off("click.chocolat").on("click.chocolat",function(t){return null===s.settings.initialZoomState&&s.elems.domContainer.hasClass("chocolat-zoomable")?s.zoomIn(t):s.zoomOut(t)}),this.elems.wrapper.mousemove(function(e){if(null!==s.settings.initialZoomState&&!s.elems.img.is(":animated")){var i=t(this).offset(),n=t(this).height(),o=t(this).width(),a=s.settings.images[s.settings.currentImage],l=a.width,r=a.height,c=[e.pageX-o/2-i.left,e.pageY-n/2-i.top],h=0;l>o&&(h=c[0]/(o/2),h=(l-o+0)/2*h);var g=0;r>n&&(g=c[1]/(n/2),g=(r-n+0)/2*g);var m={"margin-left":-h+"px","margin-top":-g+"px"};"undefined"!=typeof e.duration?t(s.elems.img).stop(!1,!0).animate(m,e.duration):t(s.elems.img).stop(!1,!0).css(m)}}),t(e).on("resize",function(){s.settings.initialized&&s.debounce(50,function(){fitting=s.fit(s.settings.currentImage,s.settings.container),s.center(fitting.width,fitting.height,fitting.left,fitting.top,0),s.zoomable()})})},zoomable:function(){var t=this.settings.images[this.settings.currentImage],e=this.elems.wrapper.width(),i=this.elems.wrapper.height(),s=t.width>e||t.height>i,n=this.elems.img.width()>t.width||this.elems.img.height()>t.height;s&&!n?this.elems.domContainer.addClass("chocolat-zoomable"):this.elems.domContainer.removeClass("chocolat-zoomable")},zoomIn:function(e){this.settings.initialZoomState=this.settings.imageSize,this.settings.imageSize="native";var i=t.Event("mousemove");return i.pageX=e.pageX,i.pageY=e.pageY,i.duration=this.settings.duration,this.elems.wrapper.trigger(i),this.elems.domContainer.addClass("chocolat-zoomed"),fitting=this.fit(this.settings.currentImage,this.settings.container),this.center(fitting.width,fitting.height,fitting.left,fitting.top,this.settings.duration)},zoomOut:function(t,e){return null!==this.settings.initialZoomState?(e=e||this.settings.duration,this.settings.imageSize=this.settings.initialZoomState,this.settings.initialZoomState=null,this.elems.img.animate({margin:0},e),this.elems.domContainer.removeClass("chocolat-zoomed"),fitting=this.fit(this.settings.currentImage,this.settings.container),this.center(fitting.width,fitting.height,fitting.left,fitting.top,e)):void 0},setDomContainer:function(){this.elems.domContainer=t(this.settings.container===e?"body":this.settings.container)},debounce:function(t,e){clearTimeout(this.settings.timerDebounce),this.settings.timerDebounce=setTimeout(function(){e()},t)},api:function(){var t=this;return{open:function(e){return e=parseInt(e)||0,t.init(e)},close:function(){return t.close()},next:function(){return t.change(1)},prev:function(){return t.change(-1)},"goto":function(e){return t.open(e)},current:function(){return t.settings.currentImage},place:function(){return t.place(t.settings.currentImage,t.settings.duration)},set:function(e,i){return t.settings[e]=i,i},get:function(e){return t.settings[e]},getElem:function(e){return t.elems[e]}}}}),t.fn.Chocolat=function(e){return this.each(function(){o++;var i=t.extend(!0,{},a,e,{setIndex:o});t.data(this,"chocolat")||t.data(this,"chocolat",new n(t(this),i))})}}(jQuery,window,document);
\ No newline at end of file
+!function(t,e,i,s){function n(e,i){var s=this;return this.settings=i,this._defaults=a,this.elems={},this.element=e,this._cssClasses=["chocolat-open","chocolat-mobile","chocolat-in-container","chocolat-cover","chocolat-zoomable","chocolat-zoomed"],!this.settings.setTitle&&e.data("chocolat-title")&&(this.settings.setTitle=e.data("chocolat-title")),this.element.find(this.settings.imageSelector).each(function(){s.settings.images.push({title:t(this).attr("title"),src:t(this).attr("href"),height:!1,width:!1})}),this.element.find(this.settings.imageSelector).each(function(e){t(this).off("click.chocolat").on("click.chocolat",function(t){s.init(e),t.preventDefault()})}),this}var o=0,a={container:e,imageSelector:".chocolat-image",className:"",imageSize:"default",initialZoomState:null,fullScreen:!1,loop:!1,linkImages:!0,duration:300,setTitle:"",separator2:"/",setIndex:0,firstImage:0,lastImage:!1,currentImage:!1,initialized:!1,timer:!1,timerDebounce:!1,images:[]};t.extend(n.prototype,{init:function(t){return this.settings.initialized||(this.setDomContainer(),this.markup(),this.events(),this.settings.lastImage=this.settings.images.length-1,this.settings.initialized=!0),this.load(t)},preload:function(e){var i=t.Deferred();if("undefined"!=typeof this.settings.images[e]){var s=new Image;return s.onload=function(){i.resolve(s)},s.src=this.settings.images[e].src,i}},load:function(e){var i=this;if(this.settings.fullScreen&&this.openFullScreen(),this.settings.currentImage!==e){this.elems.overlay.fadeIn(800),this.settings.timer=setTimeout(function(){"undefined"!=typeof i.elems&&t.proxy(i.elems.loader.fadeIn(),i)},800);var s=this.preload(e).then(function(t){return i.place(e,t)}).then(function(t){return i.appear(e)}).then(function(t){i.zoomable()}),n=e+1;return"undefined"!=typeof this.settings.images[n]&&this.preload(n),s}},place:function(t,e){var i,s=this;return this.settings.currentImage=t,this.description(),this.pagination(),this.arrows(),this.storeImgSize(e,t),i=this.fit(t,s.settings.container),this.center(i.width,i.height,i.left,i.top,0)},center:function(t,e,i,s,n){return this.elems.content.css("overflow","visible").animate({width:t,height:e,left:i,top:s},n).promise()},appear:function(t){var e=this;clearTimeout(this.settings.timer),this.elems.loader.stop().fadeOut(300,function(){e.elems.img.attr("src",e.settings.images[t].src)})},fit:function(e,i){var s,n,o=this.settings.images[e].height,a=this.settings.images[e].width,l=t(i).height(),c=t(i).width(),r=this.getOutMarginH(),h=this.getOutMarginW(),g=c-h,m=l-r,u=m/g,f=l/c,d=o/a;return"cover"==this.settings.imageSize?f>d?(s=l,n=s/d):(n=c,s=n*d):"native"==this.settings.imageSize?(s=o,n=a):(d>u?(s=m,n=s/d):(n=g,s=n*d),"default"===this.settings.imageSize&&(n>=a||s>=o)&&(n=a,s=o)),{height:s,width:n,top:(l-s)/2,left:(c-n)/2}},change:function(t){this.zoomOut(0),this.zoomable();var e=this.settings.currentImage+parseInt(t);if(e>this.settings.lastImage){if(this.settings.loop)return this.load(0)}else{if(!(0>e))return this.load(e);if(this.settings.loop)return this.load(this.settings.lastImage)}},arrows:function(){this.settings.loop?t([this.elems.left[0],this.elems.right[0]]).addClass("active"):this.settings.linkImages?(this.settings.currentImage==this.settings.lastImage?this.elems.right.removeClass("active"):this.elems.right.addClass("active"),0===this.settings.currentImage?this.elems.left.removeClass("active"):this.elems.left.addClass("active")):t([this.elems.left[0],this.elems.right[0]]).removeClass("active")},description:function(){var t=this;this.elems.description.html(t.settings.images[t.settings.currentImage].title)},pagination:function(){var t=this,e=this.settings.lastImage+1,i=this.settings.currentImage+1;this.elems.pagination.html(i+" "+t.settings.separator2+e)},storeImgSize:function(t,e){"undefined"!=typeof t&&(this.settings.images[e].height&&this.settings.images[e].width||(this.settings.images[e].height=t.height,this.settings.images[e].width=t.width))},close:function(){if(this.settings.fullscreenOpen)return void this.exitFullScreen();var e=[this.elems.overlay[0],this.elems.loader[0],this.elems.wrapper[0]],i=this,s=t.when(t(e).fadeOut(200)).done(function(){i.elems.domContainer.removeClass(this._cssClasses.join(" "))});return this.settings.currentImage=!1,this.settings.initialized=!1,s},destroy:function(){this.element.removeData(),this.element.find(this.settings.imageSelector).off("click.chocolat"),this.settings.initialized&&(this.settings.fullscreenOpen&&this.exitFullScreen(),this.settings.currentImage=!1,this.settings.initialized=!1,this.elems.domContainer.removeClass(this._cssClasses.join(" ")),this.elems.wrapper.remove())},getOutMarginW:function(){var t=this.elems.left.outerWidth(!0),e=this.elems.right.outerWidth(!0);return t+e},getOutMarginH:function(){return this.elems.top.outerHeight(!0)+this.elems.bottom.outerHeight(!0)},markup:function(){this.elems.domContainer.addClass("chocolat-open "+this.settings.className),"cover"==this.settings.imageSize&&this.elems.domContainer.addClass("chocolat-cover"),this.settings.container!==e&&this.elems.domContainer.addClass("chocolat-in-container"),this.elems.wrapper=t("<div/>",{"class":"chocolat-wrapper",id:"chocolat-content-"+this.settings.setIndex}).appendTo(this.elems.domContainer),this.elems.overlay=t("<div/>",{"class":"chocolat-overlay"}).appendTo(this.elems.wrapper),this.elems.loader=t("<div/>",{"class":"chocolat-loader"}).appendTo(this.elems.wrapper),this.elems.content=t("<div/>",{"class":"chocolat-content"}).appendTo(this.elems.wrapper),this.elems.img=t("<img/>",{"class":"chocolat-img",src:""}).appendTo(this.elems.content),this.elems.top=t("<div/>",{"class":"chocolat-top"}).appendTo(this.elems.wrapper),this.elems.left=t("<div/>",{"class":"chocolat-left"}).appendTo(this.elems.wrapper),this.elems.right=t("<div/>",{"class":"chocolat-right"}).appendTo(this.elems.wrapper),this.elems.bottom=t("<div/>",{"class":"chocolat-bottom"}).appendTo(this.elems.wrapper),this.elems.fullscreen=t("<span/>",{"class":"chocolat-fullscreen"}).appendTo(this.elems.bottom),this.elems.description=t("<span/>",{"class":"chocolat-description"}).appendTo(this.elems.bottom),this.elems.pagination=t("<span/>",{"class":"chocolat-pagination"}).appendTo(this.elems.bottom),this.elems.setTitle=t("<span/>",{"class":"chocolat-set-title",html:this.settings.setTitle}).appendTo(this.elems.bottom),this.elems.close=t("<span/>",{"class":"chocolat-close"}).appendTo(this.elems.top)},openFullScreen:function(){var t=this.elems.wrapper[0];t.requestFullscreen?(this.settings.fullscreenOpen=!0,t.requestFullscreen()):t.mozRequestFullScreen?(this.settings.fullscreenOpen=!0,t.mozRequestFullScreen()):t.webkitRequestFullscreen?(this.settings.fullscreenOpen=!0,t.webkitRequestFullscreen()):t.msRequestFullscreen?(t.msRequestFullscreen(),this.settings.fullscreenOpen=!0):this.settings.fullscreenOpen=!1},exitFullScreen:function(){i.exitFullscreen?(i.exitFullscreen(),this.settings.fullscreenOpen=!1):i.mozCancelFullScreen?(i.mozCancelFullScreen(),this.settings.fullscreenOpen=!1):i.webkitExitFullscreen?(i.webkitExitFullscreen(),this.settings.fullscreenOpen=!1):this.settings.fullscreenOpen=!0},events:function(){var s=this;t(i).off("keydown.chocolat").on("keydown.chocolat",function(t){s.settings.initialized&&(37==t.keyCode?s.change(-1):39==t.keyCode?s.change(1):27==t.keyCode&&s.close())}),this.elems.wrapper.find(".chocolat-right").off("click.chocolat").on("click.chocolat",function(){s.change(1)}),this.elems.wrapper.find(".chocolat-left").off("click.chocolat").on("click.chocolat",function(){return s.change(-1)}),t([this.elems.overlay[0],this.elems.close[0]]).off("click.chocolat").on("click.chocolat",function(){return s.close()}),this.elems.fullscreen.off("click.chocolat").on("click.chocolat",function(){return s.settings.fullscreenOpen?void s.exitFullScreen():void s.openFullScreen()}),s.settings.backgroundClose&&this.elems.overlay.off("click.chocolat").on("click.chocolat",function(){return s.close()}),this.elems.wrapper.find(".chocolat-img").off("click.chocolat").on("click.chocolat",function(t){return null===s.settings.initialZoomState&&s.elems.domContainer.hasClass("chocolat-zoomable")?s.zoomIn(t):s.zoomOut(t)}),this.elems.wrapper.mousemove(function(e){if(null!==s.settings.initialZoomState&&!s.elems.img.is(":animated")){var i=t(this).offset(),n=t(this).height(),o=t(this).width(),a=s.settings.images[s.settings.currentImage],l=a.width,c=a.height,r=[e.pageX-o/2-i.left,e.pageY-n/2-i.top],h=0;l>o&&(h=r[0]/(o/2),h=(l-o+0)/2*h);var g=0;c>n&&(g=r[1]/(n/2),g=(c-n+0)/2*g);var m={"margin-left":-h+"px","margin-top":-g+"px"};"undefined"!=typeof e.duration?t(s.elems.img).stop(!1,!0).animate(m,e.duration):t(s.elems.img).stop(!1,!0).css(m)}}),t(e).on("resize",function(){s.settings.initialized&&s.debounce(50,function(){fitting=s.fit(s.settings.currentImage,s.settings.container),s.center(fitting.width,fitting.height,fitting.left,fitting.top,0),s.zoomable()})})},zoomable:function(){var t=this.settings.images[this.settings.currentImage],e=this.elems.wrapper.width(),i=this.elems.wrapper.height(),s=t.width>e||t.height>i,n=this.elems.img.width()>t.width||this.elems.img.height()>t.height;s&&!n?this.elems.domContainer.addClass("chocolat-zoomable"):this.elems.domContainer.removeClass("chocolat-zoomable")},zoomIn:function(e){this.settings.initialZoomState=this.settings.imageSize,this.settings.imageSize="native";var i=t.Event("mousemove");return i.pageX=e.pageX,i.pageY=e.pageY,i.duration=this.settings.duration,this.elems.wrapper.trigger(i),this.elems.domContainer.addClass("chocolat-zoomed"),fitting=this.fit(this.settings.currentImage,this.settings.container),this.center(fitting.width,fitting.height,fitting.left,fitting.top,this.settings.duration)},zoomOut:function(t,e){return null!==this.settings.initialZoomState?(e=e||this.settings.duration,this.settings.imageSize=this.settings.initialZoomState,this.settings.initialZoomState=null,this.elems.img.animate({margin:0},e),this.elems.domContainer.removeClass("chocolat-zoomed"),fitting=this.fit(this.settings.currentImage,this.settings.container),this.center(fitting.width,fitting.height,fitting.left,fitting.top,e)):void 0},setDomContainer:function(){this.elems.domContainer=t(this.settings.container===e?"body":this.settings.container)},debounce:function(t,e){clearTimeout(this.settings.timerDebounce),this.settings.timerDebounce=setTimeout(function(){e()},t)},api:function(){var t=this;return{open:function(e){return e=parseInt(e)||0,t.init(e)},close:function(){return t.close()},next:function(){return t.change(1)},prev:function(){return t.change(-1)},"goto":function(e){return t.open(e)},current:function(){return t.settings.currentImage},place:function(){return t.place(t.settings.currentImage,t.settings.duration)},destroy:function(){return t.destroy()},set:function(e,i){return t.settings[e]=i,i},get:function(e){return t.settings[e]},getElem:function(e){return t.elems[e]}}}}),t.fn.Chocolat=function(e){return this.each(function(){o++;var i=t.extend(!0,{},a,e,{setIndex:o});t.data(this,"chocolat")||t.data(this,"chocolat",new n(t(this),i))})}}(jQuery,window,document);
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 3334bcf..dd7daee 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,7 @@
-##Chocolat [![Build Status](https://travis-ci.org/nicolas-t/Chocolat.svg?branch=master)](https://travis-ci.org/nicolas-t/Chocolat) 
+##Chocolat [![Build Status](https://travis-ci.org/nicolas-t/Chocolat.svg?branch=master)](https://travis-ci.org/nicolas-t/Chocolat)
 -----------
-Chocolat is a responsive jQuery lightbox plugin  
-What you are looking for is in the `/dist/` folder. 
+Chocolat is a responsive jQuery lightbox plugin
+What you are looking for is in the `/dist/` folder.
 
 #### Dependencies
 
@@ -10,7 +10,7 @@ It excepts jQuery to work (either 1.x or 2.x): https://github.com/jquery/jquery
 #### Compatibility
 recent browsers such as :
 IE 7+, Safari, Firefox & Chrome.
-  
+
 ##Markup
 -----------
 ```html
@@ -33,138 +33,143 @@ $(document).ready(function(){
 ##Documentation
 -----------
 
-### Parameters  
+### Parameters
+
+**container :** `default:window`
+Sets whether viewer will open and fill the whole page (`default`)  , or whether it should open in a particular block of the page. For example ` #container2`  in this case the height and width of the block must be defined.
+values can be : window, selector, jQuery element, or a node
 
-**container :** `default:window`  
-Sets whether viewer will open and fill the whole page (`default`)  , or whether it should open in a particular block of the page. For example ` #container2`  in this case the height and width of the block must be defined.  
-values can be : window, selector, jQuery element, or a node  
-  
-**imageSelector :** `default : '.chocolat-image'`  
-Selector to find images in the parent element (on which chocolat is called) 
-  
-**linkImages :**   `default : true `  
+**imageSelector :** `default : '.chocolat-image'`
+Selector to find images in the parent element (on which chocolat is called)
+
+**linkImages :**   `default : true `
 Sets whether we can switch from one image to another, within the same call, without closing the viewer (`true`) , or if the images remain independent (`false`).
-Warning: if `LinkImage`: is `false` then `displayAsALink` must be worth `false` too. Otherwise we can only view the first image in the set.   
-  
-**setTitle :**  `default : ''`  
-Title of the set. Can also be defined from the html, with the `data-chocolat-title` attribute  
-  
-**className :**  `default : ''`  
-Add a custom css class to the parent of the lightbox  
-  
-**imageSize :**  `default : 'default'`  
-Can be `'default'`, `'contain'`,  `'native'`, or `'cover'`.  
-`default` : if the image is bigger than the window it's resized to fit, else if the image is smaller than the window it's not streched, only displayed at native dimensions  
-`'contain'` :  if the image is bigger than the window it's resized to fit, else if the image is smaller than the window it's streched, to fit the window  
-`'cover'` :  the image cover the window, no white space are displayed.  
-more informations & exemple about contain/cover : https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Scaling_background_images  
-`'native'` :  the image is never streched nor shrinked, always displayed at native dimensions   
-  
-**fullScreen :**  `default : false`  
-HTML5 new feature. Hides the browser. 
-  
-**loop :**  `default : false`  
-Last image + 1 leads to first image & first image - 1 leads to last image.  
-  
-**duration :**  `default : 300`  
-Animations duration  
-  
-**firstImage  :**  `default : 0`  
-Index of the image that you want to start the series.  
-  
-**lastImage  :**  `default : 0`  
-Index of the image that you want to end the series.  
-  
-**separator2 :**  `default : '/'`  
-Text between the number of the image and the number of images in the set, does not matter. 
-  
-**images  :**  `default : []`  
-Array of object representing the set images `[{src:'img1.jpg'}, {src:'img1.jpg'}, ...]`  
-You can also specify image title `[{src:'img1.jpg', title: 'title'}, ..]`  
-   
-**setIndex  :**  `default : 0`   
+Warning: if `LinkImage`: is `false` then `displayAsALink` must be worth `false` too. Otherwise we can only view the first image in the set.
+
+**setTitle :**  `default : ''`
+Title of the set. Can also be defined from the html, with the `data-chocolat-title` attribute
+
+**className :**  `default : ''`
+Add a custom css class to the parent of the lightbox
+
+**imageSize :**  `default : 'default'`
+Can be `'default'`, `'contain'`,  `'native'`, or `'cover'`.
+`default` : if the image is bigger than the window it's resized to fit, else if the image is smaller than the window it's not streched, only displayed at native dimensions
+`'contain'` :  if the image is bigger than the window it's resized to fit, else if the image is smaller than the window it's streched, to fit the window
+`'cover'` :  the image cover the window, no white space are displayed.
+more informations & exemple about contain/cover : https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Scaling_background_images
+`'native'` :  the image is never streched nor shrinked, always displayed at native dimensions
+
+**fullScreen :**  `default : false`
+HTML5 new feature. Hides the browser.
+
+**loop :**  `default : false`
+Last image + 1 leads to first image & first image - 1 leads to last image.
+
+**duration :**  `default : 300`
+Animations duration
+
+**firstImage  :**  `default : 0`
+Index of the image that you want to start the series.
+
+**lastImage  :**  `default : 0`
+Index of the image that you want to end the series.
+
+**separator2 :**  `default : '/'`
+Text between the number of the image and the number of images in the set, does not matter.
+
+**images  :**  `default : []`
+Array of object representing the set images `[{src:'img1.jpg'}, {src:'img1.jpg'}, ...]`
+You can also specify image title `[{src:'img1.jpg', title: 'title'}, ..]`
+
+**setIndex  :**  `default : 0`
 Set index. yes.
-   
+
 ### API
 
 ###### Syntax
-Call chocolat like this :  
+Call chocolat like this :
 ```js
 $(document).ready(function(){
     var instance = $('#example1').Chocolat().data('chocolat');
 });
 ```
 
-Then API calls can be made like this (open for exemple):  
+Then API calls can be made like this (open for exemple):
 ```js
 instance.api().open();
 ```
-  
+
 ###### Methods
-**open  :**  `param (optionnal) : i`   
-Open the lightbox on the image whose index is `i`.  
-By default on the first image (i=0).  
-Returns a $.Deferred object.   
-
-**close  :**    
-Close the lightbox.  
-Returns a $.Deferred object.   
-
-**prev  :**    
-Change image backward.  
-Returns a $.Deferred object.   
-  
-**next  :**    
-Change image forward.  
-Returns a $.Deferred object.   
-  
-**goto  :**  `param : i`   
-(Alias of open)  go to image whose index is `i` on an already opened ligthbox.  
-Returns a $.Deferred object.   
-
-**place  :**  
-Center the image in its parent.  
-Returns a $.Deferred object.   
-  
-**set  :**   `params : property, value`   
-Classic setter  
-  
-**get  :**   `param : property`   
-Classic getter  
-  
-**getElem  :**   `param : name`   
-Returns a jQuery object composing the lightbox.  
-Ex: for the next arrow  : `instance.api().getElem('right')`    
-  
-**current  :**  
-Returns the index of the current image.  
- 
+**open  :**  `param (optionnal) : i`
+Open the lightbox on the image whose index is `i`.
+By default on the first image (i=0).
+Returns a $.Deferred object.
+
+**close  :**
+Close the lightbox.
+Returns a $.Deferred object.
+
+**prev  :**
+Change image backward.
+Returns a $.Deferred object.
+
+**next  :**
+Change image forward.
+Returns a $.Deferred object.
+
+**goto  :**  `param : i`
+(Alias of open)  go to image whose index is `i` on an already opened ligthbox.
+Returns a $.Deferred object.
+
+**place  :**
+Center the image in its parent.
+Returns a $.Deferred object.
+
+**destroy  :**
+Destroy the current instance. Remove elements, unbind events, clear data.
+
+**set  :**   `params : property, value`
+Classic setter
+
+**get  :**   `param : property`
+Classic getter
+
+**getElem  :**   `param : name`
+Returns a jQuery object composing the lightbox.
+Ex: for the next arrow  : `instance.api().getElem('right')`
+
+**current  :**
+Returns the index of the current image.
+
 ### CSS Classes
 
-**.chocolat-open  :**  
-Set to the container when the lightbox is open.  
+**.chocolat-open  :**
+Set to the container when the lightbox is open.
 
-**.chocolat-mobile  :**  
-Set to the container when its width is inferior to `480px` (or `mobileBreakpoint`)  
+**.chocolat-in-container  :**
+Set to the container when chocolat is open in a block (`container != window`)
 
-**.chocolat-in-container  :**  
-Set to the container when chocolat is open in a block (`container != window`)  
-  
-**.chocolat-cover  :**  
+**.chocolat-cover  :**
 Set to the container when chocolat `imageSize` is set to `'cover'`
-  
-**.chocolat-zoomable  :**  
+
+**.chocolat-zoomable  :**
 Set to the container when chocolat is zoomable
-  
-**.chocolat-zoomed  :**  
+
+**.chocolat-zoomed  :**
 Set to the container when chocolat is zoomed
 
 
 ##Contributing
------------  
-Feel free to contribute by forking then making a pull request.  
-Edit files in the `/src/` folder, run `gulp` to copy/minify into the `/dist/` folder and to watch for changes. 
+-----------
+Feel free to contribute by forking then making a pull request.
+Edit files in the `/src/` folder, run `gulp` to copy/minify into the `/dist/` folder and to watch for changes.
 
 ##Testing
-To test, run `gulp test`, if you don't have all packages installed then run `npm install`  
+To test, run `gulp test`, if you don't have all packages installed then run `npm install`
 Tests are written in `test/src/test.chocolat.coffee`
+
+
+##Angular (ng-chocolat)
+An angular directive of Chocolat.js exists thanks to @beuted:
+https://github.com/beuted/ng-chocolat
diff --git a/src/js/jquery.chocolat.js b/src/js/jquery.chocolat.js
index 48f5601..bf95897 100644
--- a/src/js/jquery.chocolat.js
+++ b/src/js/jquery.chocolat.js
@@ -19,7 +19,7 @@
         initialized       : false,
         timer             : false,
         timerDebounce     : false,
-        images            : []
+        images            : [],
     };
 
     function Chocolat(element, settings) {
@@ -28,12 +28,23 @@
         this.settings  = settings;
         this._defaults = defaults;
         this.elems     = {};
+        this.element   = element;
+
+        this._cssClasses = [
+            'chocolat-open',
+            'chocolat-mobile',
+            'chocolat-in-container',
+            'chocolat-cover',
+            'chocolat-zoomable',
+            'chocolat-zoomed'
+        ];
 
         if (!this.settings.setTitle && element.data('chocolat-title')) {
             this.settings.setTitle = element.data('chocolat-title');
         }
 
-        element.find(this.settings.imageSelector).each(function () {
+
+        this.element.find(this.settings.imageSelector).each(function () {
             that.settings.images.push({
                 title  : $(this).attr('title'),
                 src    : $(this).attr('href'),
@@ -42,10 +53,10 @@
             });
         });
 
-        element.find(this.settings.imageSelector).each(function (i) {
-            $(this).off('click').on('click', function(event){
+        this.element.find(this.settings.imageSelector).each(function (i) {
+            $(this).off('click.chocolat').on('click.chocolat', function(e){
                 that.init(i);
-                event.preventDefault();
+                e.preventDefault();
             });
         });
 
@@ -299,7 +310,7 @@
             ];
             var that = this;
             var def = $.when($(els).fadeOut(200)).done(function () {
-                that.elems.domContainer.removeClass('chocolat-open chocolat-mobile chocolat-in-container chocolat-cover');
+                that.elems.domContainer.removeClass(that._cssClasses.join(' '));
             });
             this.settings.currentImage = false;
             this.settings.initialized = false;
@@ -307,6 +318,22 @@
             return def;
         },
 
+        destroy : function() {
+            this.element.removeData();
+            this.element.find(this.settings.imageSelector).off('click.chocolat');
+
+            if (!this.settings.initialized) {
+                return;
+            }
+            if (this.settings.fullscreenOpen) {
+                this.exitFullScreen();
+            }
+            this.settings.currentImage = false;
+            this.settings.initialized = false;
+            this.elems.domContainer.removeClass(this._cssClasses.join(' '));
+            this.elems.wrapper.remove();
+        },
+
         getOutMarginW : function() {
             var left  = this.elems.left.outerWidth(true);
             var right = this.elems.right.outerWidth(true);
@@ -651,6 +678,10 @@
                     return that.place(that.settings.currentImage, that.settings.duration);
                 },
 
+                destroy : function(){
+                    return that.destroy();
+                },
+
                 set : function(property, value){
                     that.settings[property] = value;
                     return value;
diff --git a/test/test.chocolat.coffee b/test/test.chocolat.coffee
index f131d0b..c6c40c4 100644
--- a/test/test.chocolat.coffee
+++ b/test/test.chocolat.coffee
@@ -2,14 +2,7 @@ describe "Chocolat", ->
     describe "Opening", ->
         afterEach ->
             chocolat = $('#example0').data('chocolat')
-
-            chocolat.elems.wrapper.remove()
-
-            chocolat.elems.domContainer.removeClass('chocolat-open chocolat-mobile chocolat-in-container chocolat-cover');
-            chocolat.settings.currentImage = false;
-            chocolat.settings.initialized = false;
-
-            $('#example0').data('chocolat', null)
+            chocolat.api().destroy()
 
         it "should call markup function and create markup", ->
             chocolat = $('#example0').Chocolat({
@@ -99,17 +92,59 @@ describe "Chocolat", ->
             expect(spyLoad.calledOnce).to.be.true
             expect(spyLoad.calledWithExactly(0)).to.be.true
 
-    describe "FullScreen", ->
+    describe "Destroy method", ->
         afterEach ->
             chocolat = $('#example0').data('chocolat')
+            if chocolat?
+                chocolat.api().destroy()
+
+        it "should remove data from calling element", ->
+
+            chocolat = $('#example0').Chocolat().data('chocolat')
+
+            dataBefore = $('#example0').data('chocolat')
+            expect(dataBefore).not.to.be.null
+
+            chocolat.api().destroy()
+
+            dataAfter = $('#example0').data('chocolat')
+            expect(dataAfter).to.be.undefined
+
+        it "should remove wrapper element", (done) ->
+
+            chocolat = $('#example0').Chocolat().data('chocolat')
+
+            chocolat.api().open().done( ->
+                lengthBefore = $('.chocolat-wrapper').length
+                expect(lengthBefore).to.equal(1)
+
+                chocolat.api().destroy()
+
+                lengthAfter = $('.chocolat-wrapper').length
+                expect(lengthAfter).to.equal(0)
+                done()
+            )
 
-            chocolat?.elems?.wrapper?.remove()
+        it "should unbind event handler of the links (triggering chocolat.open)", ->
 
-            chocolat?.elems?.domContainer?.removeClass('chocolat-open chocolat-mobile chocolat-in-container chocolat-cover');
-            chocolat?.settings.currentImage = false;
-            chocolat?.settings.initialized = false;
+            chocolat = $('#example0').Chocolat().data('chocolat')
+            imageSelector = chocolat.api().get('imageSelector')
+
+            links = chocolat.element.find(imageSelector)
+
+            eventBefore = $._data(links.first()[0], 'events')
+            expect(eventBefore.click[0].namespace).to.equal('chocolat')
+
+            chocolat.api().destroy()
+
+            eventAfter = $._data(links.first()[0], 'events')
+            expect(typeof eventAfter).to.equal('undefined')
 
-            $('#example0').data('chocolat', null)
+
+    describe "FullScreen", ->
+        afterEach ->
+            chocolat = $('#example0').data('chocolat')
+            chocolat.api().destroy()
 
         it "should open fullscreen when clicking .fullscreen", (done) ->
 
@@ -196,14 +231,7 @@ describe "Chocolat", ->
     describe "Change image", ->
         afterEach ->
             chocolat = $('#example0').data('chocolat')
-
-            chocolat.elems.wrapper.remove()
-
-            chocolat.elems.domContainer.removeClass('chocolat-open chocolat-mobile chocolat-in-container chocolat-cover');
-            chocolat.settings.currentImage = false;
-            chocolat.settings.initialized = false;
-
-            $('#example0').data('chocolat', null)
+            chocolat.api().destroy()
 
         it "should go to next image", (done) ->
             chocolat = $('#example0').Chocolat().data('chocolat')
@@ -290,14 +318,7 @@ describe "Chocolat", ->
     describe "ImageSize cover", ->
         afterEach ->
             chocolat = $('#example0').data('chocolat')
-
-            chocolat.elems.wrapper.remove()
-
-            chocolat.elems.domContainer.removeClass('chocolat-open chocolat-mobile chocolat-in-container chocolat-cover');
-            chocolat.settings.currentImage = false;
-            chocolat.settings.initialized = false;
-
-            $('#example0').data('chocolat', null)
+            chocolat.api().destroy()
 
         it "should add class chocolat-cover to parent", (done) ->
             chocolat = $('#example0').Chocolat({imageSize: 'cover'}).data('chocolat')
@@ -393,14 +414,7 @@ describe "Chocolat", ->
     describe "ImageSize contain", ->
         afterEach ->
             chocolat = $('#example0').data('chocolat')
-
-            chocolat.elems.wrapper.remove()
-
-            chocolat.elems.domContainer.removeClass('chocolat-open chocolat-mobile chocolat-in-container chocolat-cover');
-            chocolat.settings.currentImage = false;
-            chocolat.settings.initialized = false;
-
-            $('#example0').data('chocolat', null)
+            chocolat.api().destroy()
 
         it "should have 'longest' side of the container equal to 'longest' side to the image in container", (done) ->
             chocolat = $('#example0').Chocolat({
@@ -532,6 +546,9 @@ describe "Chocolat", ->
         it "should have a place method", ->
             expect(typeof chocolat.api().place).to.equal("function")
 
+        it "should have a destroy method", ->
+            expect(typeof chocolat.api().destroy).to.equal("function")
+
         it "should have a set method", ->
             expect(typeof chocolat.api().set).to.equal("function")
 
