Improve pagination slightly.
Merge pull request #19 from mex/majjoha/better-pagination

Improve pagination slightly.