Update pagination recipe
Updates based on review; fixes #530
Merge branch 'issue-530-pagination'