diff --git a/README.md b/README.md
index 0d6a2ac..58ed20c 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,12 @@ More examples can be found on [project homepage](http://botmonster.com/jquery-bo
 
 ```javascript
 $('#pagination-here').bootpag({
-    total: 7,          // total pages
+    pageSize: 10,      // items per page, default: 1
+    total: 7,          // total items
     page: 1,            // default page
     maxVisible: 5,     // visible pagination
-    leaps: true         // next/prev leaps through maxVisible
+    leaps: true,         // next/prev leaps through maxVisible
+    boundaryLeaps: true   // whether disable next/prev button when page is in the first/last set of pages
 }).on("page", function(event, num){
     $("#content").html("Page " + num); // or some ajax content loading...
     // ... after content load -> change total to 10
diff --git a/lib/jquery.bootpag.js b/lib/jquery.bootpag.js
index d5d101f..d7b1550 100644
--- a/lib/jquery.bootpag.js
+++ b/lib/jquery.bootpag.js
@@ -10,110 +10,127 @@
  * Project home:
  *   http://botmonster.com/jquery-bootpag/
  *
- * Version:  1.0.7
+ * Version:  1.0.8
  *
  */
+ 
 (function($, window) {
 
-    $.fn.bootpag = function(options){
+    $.fn.bootpag = function(options) {
 
         var $owner = this,
             settings = $.extend({
-                total: 0,
+                pageSize: 1, //items per page
+                total: 0, // total items
                 page: 1,
                 maxVisible: null,
                 leaps: true,
+                boundaryLeaps: true, //whether disable next/prev button when page is in the first/last set of pages
                 href: 'javascript:void(0);',
                 hrefVariable: '{{number}}',
                 next: '»',
                 prev: '«',
-				firstLastUse: false,
+                firstLastUse: false,
                 first: '<span aria-hidden="true">&larr;</span>',
                 last: '<span aria-hidden="true">&rarr;</span>',
+                infoUse: true, // total info
+                infoPosition: 'right', // 'left', 'right',works only when infoUse is true
+                info: '共{{total}}条/{{totalPage}}页',
                 wrapClass: 'pagination',
                 activeClass: 'active',
                 disabledClass: 'disabled',
                 nextClass: 'next',
                 prevClass: 'prev',
-		        lastClass: 'last',
-                firstClass: 'first'
+                lastClass: 'last',
+                firstClass: 'first',
+                infoClass: 'info'
             },
             $owner.data('settings') || {},
             options || {});
 
-        if(settings.total <= 0)
-            return this;
+        if (!settings.total || settings.total < 0) {
+            settings.total = 0;
+        }
 
-          if(!$.isNumeric(settings.maxVisible) && !settings.maxVisible){
+        if(!$.isNumeric(settings.maxVisible) && !settings.maxVisible){
             settings.maxVisible = parseInt(settings.total, 10);
         }
 
+        if (!settings.pageSize || settings.pageSize < 1) {
+	        settings.pageSize = 1;
+        }
+
         $owner.data('settings', settings);
 
         function renderPage($bootpag, page){
-
             page = parseInt(page, 10);
             var lp,
-                maxV = settings.maxVisible == 0 ? 1 : settings.maxVisible,
-                step = settings.maxVisible == 1 ? 0 : 1,
-                vis = Math.floor((page - 1) / maxV) * maxV,
-                $page = $bootpag.find('li');
-            settings.page = page = page < 0 ? 0 : page > settings.total ? settings.total : page;
+                vis,
+                totalPage,
+                info,
+                maxV = settings.maxVisible || 1,
+                $page = $bootpag.find('li'),
+                lfirst = $page.first(),
+                llast = $page.last();
+
+            totalPage = Math.ceil(settings.total/settings.pageSize) || 1;
+            settings.page = page = page < 1 ? 1 : page > totalPage ? totalPage : page;
+            vis = Math.floor((page - 1) / maxV) * maxV;
+            info = settings.info.replace('{{total}}', settings.total).replace('{{totalPage}}', totalPage);
+
             $page.removeClass(settings.activeClass);
+
+            if (settings.infoUse && settings.infoPosition === 'left') {
+            	lfirst.addClass(settings.disabledClass).find('a').html(info);
+            	lfirst = lfirst.next();
+            }
+
+            if(settings.firstLastUse) {
+                lfirst.toggleClass(settings.disabledClass, page === 1);
+                lfirst = lfirst.next();
+            }
+
             lp = page - 1 < 1 ? 1 :
-                    settings.leaps && page - 1 >= settings.maxVisible ?
-                        Math.floor((page - 1) / maxV) * maxV : page - 1;
-
-			if(settings.firstLastUse) {
-				$page
-					.first()
-					.toggleClass(settings.disabledClass, page === 1);
-			}
-
-			var lfirst = $page.first();
-			if(settings.firstLastUse) {
-				lfirst = lfirst.next();
-			}
-
-			lfirst
-                .toggleClass(settings.disabledClass, page === 1)
+                    settings.leaps && page - 1 >= maxV ?
+                        vis : page - 1;
+
+            lfirst
+                .toggleClass(settings.disabledClass, page === 1 || (settings.leaps && !settings.boundaryLeaps && vis == 0))
                 .attr('data-lp', lp)
                 .find('a').attr('href', href(lp));
 
-            var step = settings.maxVisible == 1 ? 0 : 1;
+            if (settings.infoUse && settings.infoPosition === 'right') {
+            	llast.addClass(settings.disabledClass).find('a').html(info);
+            	llast = llast.prev();
+            }
 
-            lp = page + 1 > settings.total ? settings.total :
-                    settings.leaps && page + 1 < settings.total - settings.maxVisible ?
-                        vis + settings.maxVisible + step: page + 1;
+            if(settings.firstLastUse) {
+            	llast.toggleClass(settings.disabledClass, page === totalPage);
+                llast = llast.prev();
+            }
 
-			var llast = $page.last();
-			if(settings.firstLastUse) {
-				llast = llast.prev();
-			}
+            lp = page + 1 > totalPage ? totalPage :
+                    settings.leaps && vis < totalPage - maxV ?
+                        vis + maxV + 1: page + 1;
 
-			llast
-                .toggleClass(settings.disabledClass, page === settings.total)
+            llast
+                .toggleClass(settings.disabledClass, page === totalPage || (settings.leaps && !settings.boundaryLeaps && vis + maxV >= totalPage))
                 .attr('data-lp', lp)
                 .find('a').attr('href', href(lp));
 
-			$page
-				.last()
-				.toggleClass(settings.disabledClass, page === settings.total);
-
-
             var $currPage = $page.filter('[data-lp='+page+']');
 
-			var clist = "." + [settings.nextClass,
-							   settings.prevClass,
+            var clist = "." + [settings.nextClass,
+                               settings.prevClass,
                                settings.firstClass,
-                               settings.lastClass].join(",.");
+                               settings.lastClass,
+                               settings.infoClass].join(",.");
             if(!$currPage.not(clist).length){
-                var d = page <= vis ? -settings.maxVisible : 0;
                 $page.not(clist).each(function(index){
-                    lp = index + 1 + vis + d;
+                    lp = index + 1 + vis;
                     $(this)
                         .attr('data-lp', lp)
-                        .toggle(lp <= settings.total)
+                        .toggle(lp <= totalPage)
                         .find('a').html(lp).attr('href', href(lp));
                 });
                 $currPage = $page.filter('[data-lp='+page+']');
@@ -122,7 +139,7 @@
             $owner.data('settings', settings);
         }
 
-        function href(c){
+         function href(c){
 
             return settings.href.replace(settings.hrefVariable, c);
         }
@@ -130,8 +147,16 @@
         return this.each(function(){
 
             var $bootpag, lp, me = $(this),
+            	maxV = settings.maxVisible || 1,
+            	totalPage = Math.ceil(settings.total/settings.pageSize),
+            	info = settings.info.replace('{{total}}', settings.total).replace('{{totalPage}}', totalPage),
                 p = ['<ul class="', settings.wrapClass, ' bootpag">'];
 
+            if (settings.infoUse && settings.infoPosition === 'left') {
+            	p = p.concat(['<li class="', settings.infoClass,
+            		'"><a href="javascript:void(0)">', info, '</a></li>']);
+            }
+
             if(settings.firstLastUse){
                 p = p.concat(['<li data-lp="1" class="', settings.firstClass,
                        '"><a href="', href(1), '">', settings.first, '</a></li>']);
@@ -140,19 +165,25 @@
                 p = p.concat(['<li data-lp="1" class="', settings.prevClass,
                        '"><a href="', href(1), '">', settings.prev, '</a></li>']);
             }
-            for(var c = 1; c <= Math.min(settings.total, settings.maxVisible); c++){
+            for(var c = 1; c <= Math.min(totalPage||1, maxV); c++){
                 p = p.concat(['<li data-lp="', c, '"><a href="', href(c), '">', c, '</a></li>']);
             }
             if(settings.next){
-                lp = settings.leaps && settings.total > settings.maxVisible
-                    ? Math.min(settings.maxVisible + 1, settings.total) : 2;
+                lp = settings.page + 1 > totalPage ? totalPage :
+                	settings.leaps && totalPage > maxV ?
+                    	maxV + 1: settings.page + 1;
                 p = p.concat(['<li data-lp="', lp, '" class="',
                              settings.nextClass, '"><a href="', href(lp),
                              '">', settings.next, '</a></li>']);
             }
             if(settings.firstLastUse){
-                p = p.concat(['<li data-lp="', settings.total, '" class="last"><a href="',
-                             href(settings.total),'">', settings.last, '</a></li>']);
+                p = p.concat(['<li data-lp="', totalPage, '" class="', settings.lastClass,
+                	'"><a href="', href(totalPage),'">', settings.last, '</a></li>']);
+            }
+
+            if (settings.infoUse && settings.infoPosition === 'right') {
+                p = p.concat(['<li class="', settings.infoClass,
+                    '"><a href="javascript:void(0)">', info, '</a></li>']);
             }
             p.push('</ul>');
             me.find('ul.bootpag').remove();
@@ -174,6 +205,7 @@
             });
             renderPage($bootpag, settings.page);
         });
-    }
+
+    };
 
 })(jQuery, window);
diff --git a/lib/jquery.bootpag.min.js b/lib/jquery.bootpag.min.js
index 324b1a3..8effb4e 100644
--- a/lib/jquery.bootpag.min.js
+++ b/lib/jquery.bootpag.min.js
@@ -1,21 +1,17 @@
-/*
+/**
+ * @preserve
+ * bootpag - jQuery plugin for dynamic pagination
+ *
+ * Copyright (c) 2015 botmonster@7items.com
+ *
+ * Licensed under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *
+ * Project home:
+ *   http://botmonster.com/jquery-bootpag/
+ *
+ * Version:  1.0.8
+ *
+ */
 
- bootpag - jQuery plugin for dynamic pagination
-
- Copyright (c) 2015 botmonster@7items.com
-
- Licensed under the MIT license:
-   http://www.opensource.org/licenses/mit-license.php
-
- Project home:
-   http://botmonster.com/jquery-bootpag/
-
- Version:  1.0.7
-
-*/
-(function(h,q){h.fn.bootpag=function(p){function m(c,b){b=parseInt(b,10);var d,e=0==a.maxVisible?1:a.maxVisible,k=1==a.maxVisible?0:1,n=Math.floor((b-1)/e)*e,f=c.find("li");a.page=b=0>b?0:b>a.total?a.total:b;f.removeClass(a.activeClass);d=1>b-1?1:a.leaps&&b-1>=a.maxVisible?Math.floor((b-1)/e)*e:b-1;a.firstLastUse&&f.first().toggleClass(a.disabledClass,1===b);e=f.first();a.firstLastUse&&(e=e.next());e.toggleClass(a.disabledClass,1===b).attr("data-lp",d).find("a").attr("href",g(d));k=1==a.maxVisible?
-0:1;d=b+1>a.total?a.total:a.leaps&&b+1<a.total-a.maxVisible?n+a.maxVisible+k:b+1;e=f.last();a.firstLastUse&&(e=e.prev());e.toggleClass(a.disabledClass,b===a.total).attr("data-lp",d).find("a").attr("href",g(d));f.last().toggleClass(a.disabledClass,b===a.total);e=f.filter("[data-lp="+b+"]");k="."+[a.nextClass,a.prevClass,a.firstClass,a.lastClass].join(",.");if(!e.not(k).length){var m=b<=n?-a.maxVisible:0;f.not(k).each(function(b){d=b+1+n+m;h(this).attr("data-lp",d).toggle(d<=a.total).find("a").html(d).attr("href",
-g(d))});e=f.filter("[data-lp="+b+"]")}e.not(k).addClass(a.activeClass);l.data("settings",a)}function g(c){return a.href.replace(a.hrefVariable,c)}var l=this,a=h.extend({total:0,page:1,maxVisible:null,leaps:!0,href:"javascript:void(0);",hrefVariable:"{{number}}",next:"&raquo;",prev:"&laquo;",firstLastUse:!1,first:'<span aria-hidden="true">&larr;</span>',last:'<span aria-hidden="true">&rarr;</span>',wrapClass:"pagination",activeClass:"active",disabledClass:"disabled",nextClass:"next",prevClass:"prev",
-lastClass:"last",firstClass:"first"},l.data("settings")||{},p||{});if(0>=a.total)return this;h.isNumeric(a.maxVisible)||a.maxVisible||(a.maxVisible=parseInt(a.total,10));l.data("settings",a);return this.each(function(){var c,b,d=h(this);c=['<ul class="',a.wrapClass,' bootpag">'];a.firstLastUse&&(c=c.concat(['<li data-lp="1" class="',a.firstClass,'"><a href="',g(1),'">',a.first,"</a></li>"]));a.prev&&(c=c.concat(['<li data-lp="1" class="',a.prevClass,'"><a href="',g(1),'">',a.prev,"</a></li>"]));for(b=
-1;b<=Math.min(a.total,a.maxVisible);b++)c=c.concat(['<li data-lp="',b,'"><a href="',g(b),'">',b,"</a></li>"]);a.next&&(b=a.leaps&&a.total>a.maxVisible?Math.min(a.maxVisible+1,a.total):2,c=c.concat(['<li data-lp="',b,'" class="',a.nextClass,'"><a href="',g(b),'">',a.next,"</a></li>"]));a.firstLastUse&&(c=c.concat(['<li data-lp="',a.total,'" class="last"><a href="',g(a.total),'">',a.last,"</a></li>"]));c.push("</ul>");d.find("ul.bootpag").remove();d.append(c.join(""));c=d.find("ul.bootpag");d.find("li").click(function(){var b=
-h(this);if(!b.hasClass(a.disabledClass)&&!b.hasClass(a.activeClass)){var c=parseInt(b.attr("data-lp"),10);l.find("ul.bootpag").each(function(){m(h(this),c)});l.trigger("page",c)}});m(c,a.page)})}})(jQuery,window);
+(function(b,a){b.fn.bootpag=function(d){var g=this,e=b.extend({pageSize:1,total:0,page:1,maxVisible:null,leaps:true,boundaryLeaps:true,href:"javascript:void(0);",hrefVariable:"{{number}}",next:"&raquo;",prev:"&laquo;",firstLastUse:false,first:'<span aria-hidden="true">&larr;</span>',last:'<span aria-hidden="true">&rarr;</span>',infoUse:true,infoPosition:"right",info:"共{{total}}条/{{totalPage}}页",wrapClass:"pagination",activeClass:"active",disabledClass:"disabled",nextClass:"next",prevClass:"prev",lastClass:"last",firstClass:"first",infoClass:"info"},g.data("settings")||{},d||{});if(!e.total||e.total<0){e.total=0}if(!b.isNumeric(e.maxVisible)&&!e.maxVisible){e.maxVisible=parseInt(e.total,10)}if(!e.pageSize||e.pageSize<1){e.pageSize=1}g.data("settings",e);function f(h,r){r=parseInt(r,10);var p,i,n,l,j=e.maxVisible||1,o=h.find("li"),q=o.first(),m=o.last();n=Math.ceil(e.total/e.pageSize)||1;e.page=r=r<1?1:r>n?n:r;i=Math.floor((r-1)/j)*j;l=e.info.replace("{{total}}",e.total).replace("{{totalPage}}",n);o.removeClass(e.activeClass);if(e.infoUse&&e.infoPosition==="left"){q.addClass(e.disabledClass).find("a").html(l);q=q.next()}if(e.firstLastUse){q.toggleClass(e.disabledClass,r===1);q=q.next()}p=r-1<1?1:e.leaps&&r-1>=j?i:r-1;q.toggleClass(e.disabledClass,r===1||(e.leaps&&!e.boundaryLeaps&&i==0)).attr("data-lp",p).find("a").attr("href",c(p));if(e.infoUse&&e.infoPosition==="right"){m.addClass(e.disabledClass).find("a").html(l);m=m.prev()}if(e.firstLastUse){m.toggleClass(e.disabledClass,r===n);m=m.prev()}p=r+1>n?n:e.leaps&&i<n-j?i+j+1:r+1;m.toggleClass(e.disabledClass,r===n||(e.leaps&&!e.boundaryLeaps&&i+j>=n)).attr("data-lp",p).find("a").attr("href",c(p));var k=o.filter("[data-lp="+r+"]");var s="."+[e.nextClass,e.prevClass,e.firstClass,e.lastClass,e.infoClass].join(",.");if(!k.not(s).length){o.not(s).each(function(t){p=t+1+i;b(this).attr("data-lp",p).toggle(p<=n).find("a").html(p).attr("href",c(p))});k=o.filter("[data-lp="+r+"]")}k.not(s).addClass(e.activeClass);g.data("settings",e)}function c(h){return e.href.replace(e.hrefVariable,h)}return this.each(function(){var h,m,q=b(this),j=e.maxVisible||1,l=Math.ceil(e.total/e.pageSize),k=e.info.replace("{{total}}",e.total).replace("{{totalPage}}",l),i=['<ul class="',e.wrapClass,' bootpag">'];if(e.infoUse&&e.infoPosition==="left"){i=i.concat(['<li class="',e.infoClass,'"><a href="javascript:void(0)">',k,"</a></li>"])}if(e.firstLastUse){i=i.concat(['<li data-lp="1" class="',e.firstClass,'"><a href="',c(1),'">',e.first,"</a></li>"])}if(e.prev){i=i.concat(['<li data-lp="1" class="',e.prevClass,'"><a href="',c(1),'">',e.prev,"</a></li>"])}for(var o=1;o<=Math.min(l||1,j);o++){i=i.concat(['<li data-lp="',o,'"><a href="',c(o),'">',o,"</a></li>"])}if(e.next){m=e.page+1>l?l:e.leaps&&l>j?j+1:e.page+1;i=i.concat(['<li data-lp="',m,'" class="',e.nextClass,'"><a href="',c(m),'">',e.next,"</a></li>"])}if(e.firstLastUse){i=i.concat(['<li data-lp="',l,'" class="',e.lastClass,'"><a href="',c(l),'">',e.last,"</a></li>"])}if(e.infoUse&&e.infoPosition==="right"){i=i.concat(['<li class="',e.infoClass,'"><a href="javascript:void(0)">',k,"</a></li>"])}i.push("</ul>");q.find("ul.bootpag").remove();q.append(i.join(""));h=q.find("ul.bootpag");q.find("li").click(function n(){var p=b(this);if(p.hasClass(e.disabledClass)||p.hasClass(e.activeClass)){return}var r=parseInt(p.attr("data-lp"),10);g.find("ul.bootpag").each(function(){f(b(this),r)});g.trigger("page",r)});f(h,e.page)})}})(jQuery,window);