Pagination works
Merge branch 'pagination'