diff --git a/amadeus/templates/pagination.html b/amadeus/templates/pagination.html
index a325121..f18d0b5 100644
--- a/amadeus/templates/pagination.html
+++ b/amadeus/templates/pagination.html
@@ -2,11 +2,23 @@
 	<div class="row-fluid">
 		<div class="col-md-12 col-lg-12 col-sm-12 col-xs-12 text-center">
 		  	<ul class="pagination">
-		    	{% for page_number in paginator.page_range %}
+		  		{% if page_obj.has_previous %}
+			      	<li><a href="?page={{ page_obj.previous_page_number }}">&laquo;</a></li>
+			    {% else %}
+			      	<li class="disabled"><span>&laquo;</span></li>
+			    {% endif %}
+		    	
+		    	{% for page_number in page_numbers %}
 		    		<li{% if page_obj.number == page_number %} class="active"{% endif %}>
 		        		<a href="?page={{ page_number }}{{ getvars }}">{{ page_number }}</a>
 		    		</li>
 		    	{% endfor %}
+		    	
+		    	{% if page_obj.has_next %}
+			      	<li><a href="?page={{ page_obj.next_page_number }}">&raquo;</a></li>
+			    {% else %}
+			      	<li class="disabled"><span>&raquo;</span></li>
+			    {% endif %}
 		  	</ul>
 		</div>
 	</div>
diff --git a/amadeus/templatetags/pagination.py b/amadeus/templatetags/pagination.py
index 7b16a8e..fa2552d 100644
--- a/amadeus/templatetags/pagination.py
+++ b/amadeus/templatetags/pagination.py
@@ -10,6 +10,32 @@ def pagination(request, paginator, page_obj):
         'page_obj': page_obj,
     }
 
+    page_numbers = []
+
+    if paginator.num_pages <= 10:
+        page_numbers = paginator.page_range
+    else:
+        init = page_obj.number - 5
+        end = page_obj.number + 5
+
+        if init <= 0:
+            init = 1
+
+        if end > paginator.num_pages:
+            end = paginator.num_pages + 1
+
+        if (end - init) < 10:
+            if init == 1 and end < paginator.num_pages:
+                end += (10 - (end - init))
+            elif init > 1 and end == paginator.num_pages + 1:
+                init -= (10 - (end - init))
+
+        for n in range(init, end):
+            if n > 0 and n <= paginator.num_pages:
+                page_numbers.append(n)
+
+    context['page_numbers'] = page_numbers
+
     getvars = request.GET.copy()
 
     if 'page' in getvars:
--
libgit2 0.21.2