Bugfix for pagelimit check
Merge pull request #67 from Kunstmaan/fix/pagelimit

Bugfix for pagelimit check
Merge branch 'master' into 2.2