Pagination fix
Merge pull request #95 from Coenego/pagination-fix

Pagination fix