Fixing stuff up
Merge pull request #296 from mariomc/paginationExtension2

Fixing stuff up